Move SuggestionInjector to Tool

Author: intitni

Core/Package.swift

@@ -14,7 +14,6 @@ let package = Package(
             name: "Service",
             targets: [
                 "Service",
-                "SuggestionInjector",
                 "FileChangeChecker",
                 "LaunchAgentManager",
                 "UpdateChecker",
@@ -104,7 +103,6 @@ let package = Package(
             dependencies: [
                 "Service",
                 "Client",
-                "SuggestionInjector",
                 .product(name: "XPCShared", package: "Tool"),
                 .product(name: "SuggestionProvider", package: "Tool"),
                 .product(name: "SuggestionBasic", package: "Tool"),
@@ -147,14 +145,6 @@ let package = Package(
                 "ProExtension",
             ])
         ),
-        .target(
-            name: "SuggestionInjector",
-            dependencies: [.product(name: "SuggestionBasic", package: "Tool")]
-        ),
-        .testTarget(
-            name: "SuggestionInjectorTests",
-            dependencies: ["SuggestionInjector"]
-        ),
 
         // MARK: - Prompt To Code
 

TestPlan.xctestplan

@@ -29,13 +29,6 @@
         "name" : "ServiceTests"
       }
     },
-    {
-      "target" : {
-        "containerPath" : "container:Core",
-        "identifier" : "SuggestionInjectorTests",
-        "name" : "SuggestionInjectorTests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:Core",
@@ -154,6 +147,13 @@
         "identifier" : "SuggestionBasicTests",
         "name" : "SuggestionBasicTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Tool",
+        "identifier" : "SuggestionInjectorTests",
+        "name" : "SuggestionInjectorTests"
+      }
     }
   ],
   "version" : 1

Tool/Package.swift

@@ -20,7 +20,7 @@ let package = Package(
             name: "ChatContextCollector",
             targets: ["ChatContextCollector", "ActiveDocumentChatContextCollector"]
         ),
-        .library(name: "SuggestionBasic", targets: ["SuggestionBasic"]),
+        .library(name: "SuggestionBasic", targets: ["SuggestionBasic", "SuggestionInjector"]),
         .library(name: "ASTParser", targets: ["ASTParser"]),
         .library(name: "FocusedCodeFinder", targets: ["FocusedCodeFinder"]),
         .library(name: "Toast", targets: ["Toast"]),
@@ -159,6 +159,15 @@ let package = Package(
                 .product(name: "CodableWrappers", package: "CodableWrappers"),
             ]
         ),
+        
+        .target(
+            name: "SuggestionInjector",
+            dependencies: ["SuggestionBasic"]
+        ),
+        .testTarget(
+            name: "SuggestionInjectorTests",
+            dependencies: ["SuggestionInjector"]
+        ),
 
         .target(
             name: "AIModel",
@@ -264,6 +273,7 @@ let package = Package(
                 "SuggestionProvider",
                 "XPCShared",
                 "BuiltinExtension",
+                "SuggestionInjector",
             ]
         ),