[PackageEditor] Insert the dependencies argument in the correct position in the package initializer

Author: owenv

Sources/SPMPackageEditor/ManifestRewriter.swift

@@ -248,9 +248,15 @@ final class DependenciesArrayWriter: SyntaxRewriter {
             trailingComma: SyntaxFactory.makeCommaToken()
         )
 
-        // FIXME: This is not correct, we need to find the
-        // proper position for inserting `dependencies: []`.
-        return Syntax(node.inserting(dependenciesArg, at: 1))
+
+        let postDependenciesArgumentLabels: Set = ["targets", "swiftLanguageVersions",
+                                                   "cLanguageStandard", "cxxLanguageStandard"]
+        let existingLabels = node.map(\.label?.text)
+        let insertionIndex = existingLabels.firstIndex {
+            postDependenciesArgumentLabels.contains($0 ?? "")
+        } ?? existingLabels.endIndex
+        
+        return Syntax(node.inserting(dependenciesArg, at: insertionIndex))
     }
 }
 

Tests/SPMPackageEditorTests/AddPackageDependencyTests.swift

@@ -267,4 +267,90 @@ final class AddPackageDependencyTests: XCTestCase {
             )
             """)
     }
+
+    func testAddPackageDependency8() throws {
+        let manifest = """
+            let package = Package(
+                name: "exec",
+                platforms: [.iOS],
+                targets: [
+                    .target(name: "exec"),
+                ]
+            )
+            """
+
+
+        let editor = try ManifestRewriter(manifest)
+        try editor.addPackageDependency(
+            url: "https://github.com/foo/goo",
+            requirement: .upToNextMajor("1.0.1")
+        )
+
+        XCTAssertEqual(editor.editedManifest, """
+            let package = Package(
+                name: "exec",
+                platforms: [.iOS],
+                dependencies: [
+                    .package(url: "https://github.com/foo/goo", from: "1.0.1"),
+                ],
+                targets: [
+                    .target(name: "exec"),
+                ]
+            )
+            """)
+    }
+
+    func testAddPackageDependency9() throws {
+        let manifest = """
+            let package = Package(
+                name: "exec",
+                platforms: [.iOS],
+                swiftLanguageVersions: []
+            )
+            """
+
+
+        let editor = try ManifestRewriter(manifest)
+        try editor.addPackageDependency(
+            url: "https://github.com/foo/goo",
+            requirement: .upToNextMajor("1.0.1")
+        )
+
+        XCTAssertEqual(editor.editedManifest, """
+            let package = Package(
+                name: "exec",
+                platforms: [.iOS],
+                dependencies: [
+                    .package(url: "https://github.com/foo/goo", from: "1.0.1"),
+                ],
+                swiftLanguageVersions: []
+            )
+            """)
+    }
+
+    func testAddPackageDependency10() throws {
+        let manifest = """
+            let package = Package(
+                name: "exec",
+                platforms: [.iOS],
+            )
+            """
+
+
+        let editor = try ManifestRewriter(manifest)
+        try editor.addPackageDependency(
+            url: "https://github.com/foo/goo",
+            requirement: .upToNextMajor("1.0.1")
+        )
+
+        XCTAssertEqual(editor.editedManifest, """
+            let package = Package(
+                name: "exec",
+                platforms: [.iOS],
+                dependencies: [
+                    .package(url: "https://github.com/foo/goo", from: "1.0.1"),
+                ],
+            )
+            """)
+    }
 }