Add code actions for adding library/executable/macro targets to a package manifest

Sources/SourceKitLSP/Swift/CodeActions/PackageManifestEdits.swift

@@ -26,7 +26,47 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
       return []
     }
 
-    return addTestTargetActions(call: call, in: scope) + addProductActions(call: call, in: scope)
+    return addTargetActions(call: call, in: scope) + addTestTargetActions(call: call, in: scope)
+      + addProductActions(call: call, in: scope)
+  }
+
+  /// Produce code actions to add new targets of various kinds.
+  static func addTargetActions(
+    call: FunctionCallExprSyntax,
+    in scope: SyntaxCodeActionScope
+  ) -> [CodeAction] {
+    do {
+      var actions: [CodeAction] = []
+      let variants: [(TargetDescription.TargetType, String)] = [
+        (.regular, "library"),
+        (.executable, "executable"),
+        (.macro, "macro"),
+      ]
+
+      for (type, name) in variants {
+        let target = try TargetDescription(
+          name: "NewTarget",
+          type: type
+        )
+
+        let edits = try AddTarget.addTarget(
+          target,
+          to: scope.file
+        )
+
+        actions.append(
+          CodeAction(
+            title: "Add \(name) target",
+            kind: .refactor,
+            edit: edits.asWorkspaceEdit(snapshot: scope.snapshot)
+          )
+        )
+      }
+
+      return actions
+    } catch {
+      return []
+    }
   }
 
   /// Produce code actions to add test target(s) if we are currently on
@@ -43,28 +83,43 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
     }
 
     do {
-      // Describe the target we are going to create.
-      let target = try TargetDescription(
-        name: "\(targetName)Tests",
-        dependencies: [.byName(name: targetName, condition: nil)],
-        type: .test
-      )
+      var actions: [CodeAction] = []
 
-      let edits = try AddTarget.addTarget(target, to: scope.file)
-      return [
-        CodeAction(
-          title: "Add test target",
-          kind: .refactor,
-          edit: edits.asWorkspaceEdit(snapshot: scope.snapshot)
-        )
+      let variants: [(AddTarget.TestHarness, String)] = [
+        (.swiftTesting, "Swift Testing"),
+        (.xctest, "XCTest"),
       ]
+      for (testingLibrary, libraryName) in variants {
+        // Describe the target we are going to create.
+        let target = try TargetDescription(
+          name: "\(targetName)Tests",
+          dependencies: [.byName(name: targetName, condition: nil)],
+          type: .test
+        )
+
+        let edits = try AddTarget.addTarget(
+          target,
+          to: scope.file,
+          configuration: .init(testHarness: testingLibrary)
+        )
+
+        actions.append(
+          CodeAction(
+            title: "Add test target (\(libraryName))",
+            kind: .refactor,
+            edit: edits.asWorkspaceEdit(snapshot: scope.snapshot)
+          )
+        )
+      }
+
+      return actions
     } catch {
       return []
     }
   }
 
   /// A list of target kinds that allow the creation of tests.
-  static let targetsThatAllowTests: Set<String> = [
+  static let targetsThatAllowTests: [String] = [
     "executableTarget",
     "macro",
     "target",
@@ -110,7 +165,7 @@ struct PackageManifestEdits: SyntaxCodeActionProvider {
   }
 
   /// A list of target kinds that allow the creation of tests.
-  static let targetsThatAllowProducts: Set<String> = [
+  static let targetsThatAllowProducts: [String] = [
     "executableTarget",
     "target",
   ]

Tests/SourceKitLSPTests/CodeActionTests.swift

@@ -609,12 +609,18 @@ final class CodeActionTests: XCTestCase {
 
     // Make sure we get the expected package manifest editing actions.
     let addTestAction = codeActions.first { action in
-      return action.title == "Add test target"
+      return action.title == "Add test target (Swift Testing)"
     }
     XCTAssertNotNil(addTestAction)
 
+    XCTAssertTrue(
+      codeActions.contains { action in
+        action.title == "Add library target"
+      }
+    )
+
     guard let addTestChanges = addTestAction?.edit?.documentChanges else {
-      XCTFail("Didn't have changes in the 'Add test target' action")
+      XCTFail("Didn't have changes in the 'Add test target (Swift Testing)' action")
       return
     }