Change static method DocumentURI.for(_:testName:) to an initializer DocumentURI.init(for:testName:)

Sources/SKTestSupport/SkipUnless.swift

@@ -103,7 +103,7 @@ public actor SkipUnless {
   ) async throws {
     try await shared.skipUnlessSupportedByToolchain(swiftVersion: SwiftVersion(5, 11), file: file, line: line) {
       let testClient = try await TestSourceKitLSPClient()
-      let uri = DocumentURI.for(.swift)
+      let uri = DocumentURI(for: .swift)
       testClient.openDocument("0.bitPattern", uri: uri)
       let response = try unwrap(
         await testClient.send(DocumentSemanticTokensRequest(textDocument: TextDocumentIdentifier(uri)))
@@ -134,7 +134,7 @@ public actor SkipUnless {
   ) async throws {
     try await shared.skipUnlessSupportedByToolchain(swiftVersion: SwiftVersion(5, 11), file: file, line: line) {
       let testClient = try await TestSourceKitLSPClient()
-      let uri = DocumentURI.for(.swift)
+      let uri = DocumentURI(for: .swift)
       let positions = testClient.openDocument("func 1️⃣test() {}", uri: uri)
       do {
         _ = try await testClient.send(
@@ -154,7 +154,7 @@ public actor SkipUnless {
   ) async throws {
     try await shared.skipUnlessSupportedByToolchain(swiftVersion: SwiftVersion(5, 11), file: file, line: line) {
       let testClient = try await TestSourceKitLSPClient()
-      let uri = DocumentURI.for(.c)
+      let uri = DocumentURI(for: .c)
       let positions = testClient.openDocument("void 1️⃣test() {}", uri: uri)
       do {
         _ = try await testClient.send(
@@ -214,7 +214,7 @@ public actor SkipUnless {
     return try await shared.skipUnlessSupportedByToolchain(swiftVersion: SwiftVersion(6, 0), file: file, line: line) {
       // The XML-based doc comment conversion did not preserve `Precondition`.
       let testClient = try await TestSourceKitLSPClient()
-      let uri = DocumentURI.for(.swift)
+      let uri = DocumentURI(for: .swift)
       let positions = testClient.openDocument(
         """
         /// - Precondition: Must have an apple

Sources/SKTestSupport/Utils.swift

@@ -36,16 +36,17 @@ extension Language {
 }
 
 extension DocumentURI {
-  /// Create a unique URI for a document of the given language.
-  public static func `for`(_ language: Language, testName: String = #function) -> DocumentURI {
+  /// Construct a `DocumentURI` by creating a unique URI for a document of the given language.
+  public init(for language: Language, testName: String = #function) {
     let testBaseName = testName.prefix(while: \.isLetter)
 
     #if os(Windows)
     let url = URL(fileURLWithPath: "C:/\(testBaseName)/\(UUID())/test.\(language.fileExtension)")
     #else
     let url = URL(fileURLWithPath: "/\(testBaseName)/\(UUID())/test.\(language.fileExtension)")
     #endif
-    return DocumentURI(url)
+
+    self.init(url)
   }
 }
 

Tests/SourceKitDTests/CrashRecoveryTests.swift

@@ -52,7 +52,7 @@ final class CrashRecoveryTests: XCTestCase {
       capabilities: ClientCapabilities(window: WindowClientCapabilities(workDoneProgress: true)),
       usePullDiagnostics: false
     )
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
 
     let positions = testClient.openDocument(
       """
@@ -150,7 +150,7 @@ final class CrashRecoveryTests: XCTestCase {
     try SkipUnless.longTestsEnabled()
 
     let testClient = try await TestSourceKitLSPClient()
-    let uri = DocumentURI.for(.cpp)
+    let uri = DocumentURI(for: .cpp)
 
     let positions = testClient.openDocument("1️⃣", uri: uri)
 
@@ -256,7 +256,7 @@ final class CrashRecoveryTests: XCTestCase {
     try SkipUnless.longTestsEnabled()
 
     let testClient = try await TestSourceKitLSPClient()
-    let uri = DocumentURI.for(.cpp)
+    let uri = DocumentURI(for: .cpp)
 
     let positions = testClient.openDocument("1️⃣", uri: uri)
 

Tests/SourceKitDTests/SourceKitDTests.swift

@@ -30,7 +30,7 @@ final class SourceKitDTests: XCTestCase {
     let sourcekitdPath = await ToolchainRegistry.forTesting.default!.sourcekitd!
     let sourcekitd = try await DynamicallyLoadedSourceKitD.getOrCreate(dylibPath: sourcekitdPath)
     let keys = sourcekitd.keys
-    let path = DocumentURI.for(.swift).pseudoPath
+    let path = DocumentURI(for: .swift).pseudoPath
 
     let isExpectedNotification = { @Sendable (response: SKDResponse) -> Bool in
       if let notification: sourcekitd_api_uid_t = response.value?[keys.notification],

Tests/SourceKitLSPTests/BuildSystemTests.swift

@@ -159,7 +159,7 @@ final class BuildSystemTests: XCTestCase {
   func testClangdDocumentUpdatedBuildSettings() async throws {
     guard haveClangd else { return }
 
-    let doc = DocumentURI.for(.objective_c)
+    let doc = DocumentURI(for: .objective_c)
     let args = [doc.pseudoPath, "-DDEBUG"]
     let text = """
       #ifdef FOO
@@ -201,7 +201,7 @@ final class BuildSystemTests: XCTestCase {
   }
 
   func testSwiftDocumentUpdatedBuildSettings() async throws {
-    let doc = DocumentURI.for(.swift)
+    let doc = DocumentURI(for: .swift)
     let args = await FallbackBuildSystem(buildSetup: .default)
       .buildSettings(for: doc, language: .swift)!
       .compilerArguments
@@ -236,7 +236,7 @@ final class BuildSystemTests: XCTestCase {
   }
 
   func testClangdDocumentFallbackWithholdsDiagnostics() async throws {
-    let doc = DocumentURI.for(.objective_c)
+    let doc = DocumentURI(for: .objective_c)
     let args = [doc.pseudoPath, "-DDEBUG"]
     let text = """
         #ifdef FOO
@@ -270,7 +270,7 @@ final class BuildSystemTests: XCTestCase {
   }
 
   func testSwiftDocumentFallbackWithholdsSemanticDiagnostics() async throws {
-    let doc = DocumentURI.for(.swift)
+    let doc = DocumentURI(for: .swift)
 
     // Primary settings must be different than the fallback settings.
     var primarySettings = await FallbackBuildSystem(buildSetup: .default).buildSettings(for: doc, language: .swift)!

Tests/SourceKitLSPTests/CodeActionTests.swift

@@ -191,7 +191,7 @@ final class CodeActionTests: XCTestCase {
 
   func testEmptyCodeActionResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       func foo() -> String {
@@ -214,7 +214,7 @@ final class CodeActionTests: XCTestCase {
 
   func testSemanticRefactorLocalRenameResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       func localRename() {
@@ -240,7 +240,7 @@ final class CodeActionTests: XCTestCase {
 
   func testSemanticRefactorLocationCodeActionResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       func foo() -> String {
@@ -297,7 +297,7 @@ final class CodeActionTests: XCTestCase {
 
   func testJSONCodableCodeActionResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
          1️⃣{
@@ -339,7 +339,7 @@ final class CodeActionTests: XCTestCase {
 
   func testSemanticRefactorRangeCodeActionResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       func foo() -> String {
@@ -410,7 +410,7 @@ final class CodeActionTests: XCTestCase {
       capabilities: clientCapabilitiesWithCodeActionSupport,
       usePullDiagnostics: false
     )
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
 
     let positions = testClient.openDocument(
       """
@@ -497,7 +497,7 @@ final class CodeActionTests: XCTestCase {
 
   func testAddDocumentationCodeActionResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       2️⃣func refacto1️⃣r(syntax: DeclSyntax, in context: Void) -> DeclSyntax? { }3️⃣
@@ -576,7 +576,7 @@ final class CodeActionTests: XCTestCase {
 
   func testPackageManifestEditingCodeActionResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       // swift-tools-version: 5.5
@@ -650,7 +650,7 @@ final class CodeActionTests: XCTestCase {
 
   func testPackageManifestEditingCodeActionNoTestResult() async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       // swift-tools-version: 5.5
@@ -1014,7 +1014,7 @@ final class CodeActionTests: XCTestCase {
     line: UInt = #line
   ) async throws {
     let testClient = try await TestSourceKitLSPClient(capabilities: clientCapabilitiesWithCodeActionSupport)
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(markedText, uri: uri)
 
     var ranges = ranges

Tests/SourceKitLSPTests/DefinitionTests.swift

@@ -19,7 +19,7 @@ import enum PackageLoading.Platform
 class DefinitionTests: XCTestCase {
   func testJumpToDefinitionAtEndOfIdentifier() async throws {
     let testClient = try await TestSourceKitLSPClient()
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
 
     let positions = testClient.openDocument(
       """
@@ -200,7 +200,7 @@ class DefinitionTests: XCTestCase {
 
   func testReportInitializerOnDefinitionForType() async throws {
     let testClient = try await TestSourceKitLSPClient()
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
     let positions = testClient.openDocument(
       """
       struct 1️⃣Foo {
@@ -353,7 +353,7 @@ class DefinitionTests: XCTestCase {
 
   func testDefinitionOfImplicitInitializer() async throws {
     let testClient = try await TestSourceKitLSPClient()
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
 
     let positions = testClient.openDocument(
       """

Tests/SourceKitLSPTests/DocumentColorTests.swift

@@ -22,7 +22,7 @@ final class DocumentColorTests: XCTestCase {
   private func performDocumentColorRequest(text: String) async throws -> [ColorInformation] {
     let testClient = try await TestSourceKitLSPClient()
 
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
 
     testClient.openDocument(text, uri: uri)
 
@@ -37,7 +37,7 @@ final class DocumentColorTests: XCTestCase {
   ) async throws -> [ColorPresentation] {
     let testClient = try await TestSourceKitLSPClient()
 
-    let uri = DocumentURI.for(.swift)
+    let uri = DocumentURI(for: .swift)
 
     testClient.openDocument(text, uri: uri)
 

Tests/SourceKitLSPTests/DocumentSymbolTests.swift

@@ -738,7 +738,7 @@ fileprivate func assertDocumentSymbols(
   line: UInt = #line
 ) async throws {
   let testClient = try await TestSourceKitLSPClient()
-  let uri = DocumentURI.for(.swift)
+  let uri = DocumentURI(for: .swift)
 
   let positions = testClient.openDocument(markedText, uri: uri)
   let symbols = try unwrap(try await testClient.send(DocumentSymbolRequest(textDocument: TextDocumentIdentifier(uri))))