Define sources of ChangeWorkspaceFolders inline

Author: ahoppen

Sources/SKTestSupport/INPUTS/ChangeWorkspaceFolders/Package.swift

@@ -28,7 +28,8 @@ public struct RelativeFileLocation: Hashable, ExpressibleByStringLiteral {
   }
 
   public init(stringLiteral value: String) {
-    self.init(value)
+    let components = value.components(separatedBy: "/")
+    self.init(directories: components.dropLast(), components.last!)
   }
 }
 

Sources/SKTestSupport/INPUTS/ChangeWorkspaceFolders/Sources/otherPackage/otherPackage.swift

@@ -38,7 +38,7 @@ public class SwiftPMTestWorkspace: MultiFileTestWorkspace {
   public init(
     files: [String: String],
     manifest: String = SwiftPMTestWorkspace.defaultPackageManifest,
-    index: Bool = false,
+    build: Bool = false,
     testName: String = #function
   ) async throws {
     var filesByPath: [RelativeFileLocation: String] = [:]
@@ -55,8 +55,15 @@ public class SwiftPMTestWorkspace: MultiFileTestWorkspace {
       throw Error.swiftNotFound
     }
 
-    if index {
-      try await Process.checkNonZeroExit(arguments: [swift.path, "build", "--package-path", scratchDirectory.path])
+    if build {
+      let arguments = [
+        swift.path,
+        "build",
+        "--package-path", scratchDirectory.path,
+        "-Xswiftc", "-index-ignore-system-modules",
+        "-Xcc", "-index-ignore-system-symbols",
+      ]
+      try await Process.checkNonZeroExit(arguments: arguments)
     }
     // Wait for the indexstore-db to finish indexing
     _ = try await testClient.send(PollIndexRequest())

Sources/SKTestSupport/INPUTS/ChangeWorkspaceFolders/Sources/package/package.swift

@@ -239,42 +239,67 @@ final class WorkspaceTests: XCTestCase {
   }
 
   func testChangeWorkspaceFolders() async throws {
-    guard let ws = try await staticSourceKitSwiftPMWorkspace(name: "ChangeWorkspaceFolders") else { return }
-    // Build the package. We can't use ws.buildAndIndex() because that doesn't put the build products in .build where SourceKit-LSP expects them.
+    let ws = try await MultiFileTestWorkspace(
+      files: [
+        "subdir/Sources/otherPackage/otherPackage.swift": """
+        import package
+
+        func test() {
+          Package().1️⃣helloWorld()
+        }
+        """,
+        "subdir/Sources/package/package.swift": """
+        public struct Package {
+          public init() {}
+
+          public func helloWorld() {
+            print("Hello world!")
+          }
+        }
+        """,
+        "subdir/Package.swift": """
+        // swift-tools-version: 5.5
+
+        import PackageDescription
+
+        let package = Package(
+          name: "package",
+          products: [
+            .library(name: "package", targets: ["package"]),
+            .library(name: "otherPackage", targets: ["otherPackage"]),
+          ],
+          targets: [
+            .target(
+              name: "package",
+              dependencies: []
+            ),
+            .target(
+              name: "otherPackage",
+              dependencies: ["package"]
+            ),
+          ]
+        )
+        """,
+      ]
+    )
+
+    let packageDir = try ws.uri(for: "Package.swift").fileURL!.deletingLastPathComponent()
+
     try await TSCBasic.Process.checkNonZeroExit(arguments: [
       ToolchainRegistry.shared.default!.swift!.pathString,
       "build",
-      "--package-path", ws.sources.rootDirectory.path,
+      "--package-path", packageDir.path,
       "-Xswiftc", "-index-ignore-system-modules",
       "-Xcc", "-index-ignore-system-symbols",
     ])
 
-    let otherPackLoc = ws.testLoc("otherPackage:call")
-
-    let testClient = try await TestSourceKitLSPClient(
-      capabilities: ClientCapabilities(
-        workspace: .init(workspaceFolders: true)
-      ),
-      workspaceFolders: [WorkspaceFolder(uri: DocumentURI(ws.sources.rootDirectory.deletingLastPathComponent()))]
-    )
+    let (otherPackageUri, positions) = try ws.openDocument("otherPackage.swift")
+    let testPosition = positions["1️⃣"]
 
-    let docString = try String(data: Data(contentsOf: otherPackLoc.url), encoding: .utf8)!
-
-    testClient.send(
-      DidOpenTextDocumentNotification(
-        textDocument: TextDocumentItem(
-          uri: otherPackLoc.docUri,
-          language: .swift,
-          version: 1,
-          text: docString
-        )
-      )
-    )
-
-    let preChangeWorkspaceResponse = try await testClient.send(
+    let preChangeWorkspaceResponse = try await ws.testClient.send(
       CompletionRequest(
-        textDocument: TextDocumentIdentifier(otherPackLoc.docUri),
-        position: otherPackLoc.position
+        textDocument: TextDocumentIdentifier(otherPackageUri),
+        position: testPosition
       )
     )
 
@@ -284,18 +309,18 @@ final class WorkspaceTests: XCTestCase {
       "Did not expect to receive cross-module code completion results if we opened the parent directory of the package"
     )
 
-    testClient.send(
+    ws.testClient.send(
       DidChangeWorkspaceFoldersNotification(
         event: WorkspaceFoldersChangeEvent(added: [
-          WorkspaceFolder(uri: DocumentURI(ws.sources.rootDirectory))
+          WorkspaceFolder(uri: DocumentURI(packageDir))
         ])
       )
     )
 
-    let postChangeWorkspaceResponse = try await testClient.send(
+    let postChangeWorkspaceResponse = try await ws.testClient.send(
       CompletionRequest(
-        textDocument: TextDocumentIdentifier(otherPackLoc.docUri),
-        position: otherPackLoc.position
+        textDocument: TextDocumentIdentifier(otherPackageUri),
+        position: testPosition
       )
     )
 
@@ -314,7 +339,7 @@ final class WorkspaceTests: XCTestCase {
           insertTextFormat: .plain,
           textEdit: .textEdit(
             TextEdit(
-              range: otherPackLoc.position..<otherPackLoc.position,
+              range: Range(testPosition),
               newText: "helloWorld()"
             )
           )
@@ -331,7 +356,7 @@ final class WorkspaceTests: XCTestCase {
           insertTextFormat: .plain,
           textEdit: .textEdit(
             TextEdit(
-              range: otherPackLoc.position..<otherPackLoc.position,
+              range: Range(testPosition),
               newText: "self"
             )
           )