Merge pull request #1638 from ahoppen/fix-5.10-build

ahoppen · web-flow · commit 3b16288c6cc9 · 2024-08-20T11:14:54.000-07:00
Fix the build using a Swift 5.10 compiler
diff --git a/Sources/Diagnose/ActiveRequestsCommand.swift b/Sources/Diagnose/ActiveRequestsCommand.swift
@@ -66,15 +66,15 @@ package struct ActiveRequestsCommand: AsyncParsableCommand {
       log = try await readOSLog()
     }
     let logParseRegex = Regex {
-      /.*/
+      #/.*/#
       "[spid 0x"
       Capture {  // Signpost ID
         OneOrMore(.hexDigit)
       }
       ", process, "
       ZeroOrMore(.whitespace)
       Capture {  // Event ("begin", "event", "end")
-        /[a-z]+/
+        #/[a-z]+/#
       }
       "]"
       ZeroOrMore(.any)
diff --git a/Sources/SourceKitLSP/Swift/ReferenceDocumentURL.swift b/Sources/SourceKitLSP/Swift/ReferenceDocumentURL.swift
@@ -59,7 +59,7 @@ package enum ReferenceDocumentURL {
       throw ReferenceDocumentURLError(description: "Invalid Scheme for reference document")
     }
 
-    let documentType = url.host(percentEncoded: false)
+    let documentType = url.host
 
     switch documentType {
     case MacroExpansionReferenceDocumentURLData.documentType:

Original file line number	Diff line number	Diff line change
`@@ -66,15 +66,15 @@ package struct ActiveRequestsCommand: AsyncParsableCommand {`
`66`	`66`	`log = try await readOSLog()`
`67`	`67`	`}`
`68`	`68`	`let logParseRegex = Regex {`
`69`		`- /.*/`
	`69`	`+ #/.*/#`
`70`	`70`	`"[spid 0x"`
`71`	`71`	`Capture { // Signpost ID`
`72`	`72`	`OneOrMore(.hexDigit)`
`73`	`73`	`}`
`74`	`74`	`", process, "`
`75`	`75`	`ZeroOrMore(.whitespace)`
`76`	`76`	`Capture { // Event ("begin", "event", "end")`
`77`		`- /[a-z]+/`
	`77`	`+ #/[a-z]+/#`
`78`	`78`	`}`
`79`	`79`	`"]"`
`80`	`80`	`ZeroOrMore(.any)`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ package enum ReferenceDocumentURL {`
`59`	`59`	`throw ReferenceDocumentURLError(description: "Invalid Scheme for reference document")`
`60`	`60`	`}`
`61`	`61`
`62`		`- let documentType = url.host(percentEncoded: false)`
	`62`	`+ let documentType = url.host`
`63`	`63`
`64`	`64`	`switch documentType {`
`65`	`65`	`case MacroExpansionReferenceDocumentURLData.documentType:`