Move to the target file before accepting a modification

Author: intitni

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -498,17 +498,28 @@ struct PseudoCommandHandler: CommandHandler {
         }
     }
 
-    func presentFile(at fileURL: URL, line: Int = 0) async {
+    func presentFile(at fileURL: URL, line: Int?) async {
         let terminal = Terminal()
         do {
-            _ = try await terminal.runCommand(
-                "/bin/bash",
-                arguments: [
-                    "-c",
-                    "xed -l \(line) ${TARGET_FILE}",
-                ],
-                environment: ["TARGET_FILE": fileURL.path],
-            )
+            if let line {
+                _ = try await terminal.runCommand(
+                    "/bin/bash",
+                    arguments: [
+                        "-c",
+                        "xed -l \(line) ${TARGET_FILE}",
+                    ],
+                    environment: ["TARGET_FILE": fileURL.path],
+                )
+            } else {
+                _ = try await terminal.runCommand(
+                    "/bin/bash",
+                    arguments: [
+                        "-c",
+                        "xed ${TARGET_FILE}",
+                    ],
+                    environment: ["TARGET_FILE": fileURL.path],
+                )
+            }
         } catch {
             print(error)
         }

Core/Sources/SuggestionWidget/FeatureReducers/PromptToCodePanel.swift

@@ -8,6 +8,7 @@ import Preferences
 import PromptToCodeCustomization
 import PromptToCodeService
 import SuggestionBasic
+import XcodeInspector
 
 @Reducer
 public struct PromptToCodePanel {
@@ -247,7 +248,13 @@ public struct PromptToCodePanel {
 
             case .acceptButtonTapped:
                 state.hasEnded = true
+                let url = state.promptToCodeState.source.documentURL
+                let startLine = state.snippetPanels.first?.snippet.attachedRange.start.line ?? 0
                 return .run { _ in
+                    let activeDocumentURL = await XcodeInspector.shared.safe.activeDocumentURL
+                    if activeDocumentURL != url {
+                        await commandHandler.presentFile(at: url, line: startLine)
+                    }
                     await commandHandler.acceptModification()
                     activatePreviousActiveXcode()
                 }
@@ -257,7 +264,7 @@ public struct PromptToCodePanel {
                     await commandHandler.acceptModification()
                     activateThisApp()
                 }
-            
+
             case let .statusUpdated(status):
                 state.promptToCodeState.status = status
                 return .none

Tool/Sources/CommandHandler/CommandHandler.swift

@@ -39,7 +39,16 @@ public protocol CommandHandler {
 
     // MARK: Others
 
-    func presentFile(at fileURL: URL, line: Int) async
+    func presentFile(at fileURL: URL, line: Int?) async
+
+    func presentFile(at fileURL: URL) async
+}
+
+public extension CommandHandler {
+    /// Default implementation for `presentFile(at:line:)`.
+    func presentFile(at fileURL: URL) async {
+        await presentFile(at: fileURL, line: nil)
+    }
 }
 
 public struct CommandHandlerDependencyKey: DependencyKey {
@@ -117,7 +126,7 @@ public final class UniversalCommandHandler: CommandHandler {
         commandHandler.toast(string, as: type)
     }
 
-    public func presentFile(at fileURL: URL, line: Int) async {
+    public func presentFile(at fileURL: URL, line: Int?) async {
         await commandHandler.presentFile(at: fileURL, line: line)
     }
 }
@@ -175,7 +184,7 @@ struct NOOPCommandHandler: CommandHandler {
         print("toast")
     }
 
-    func presentFile(at fileURL: URL, line: Int) async {
+    func presentFile(at fileURL: URL, line: Int?) async {
         print("present file")
     }
 }