Update prompt to code

Author: intitni

Core/Sources/Service/GUI/PromptToCodeProvider+Service.swift

@@ -72,13 +72,9 @@ extension PromptToCodeProvider {
         onContinuousToggleClick = {
             service.isContinuous.toggle()
         }
-        
+
         onToggleAttachOrDetachToCode = {
-            if service.selectionRange != nil {
-                service.selectionRange = nil
-            } else {
-                // reset to selected or focused range.
-            }
+            service.toggleAttachOrDetachToCode()
         }
     }
 

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -22,7 +22,7 @@ final class WidgetDataSource {
         }
     }
 
-    private(set) var promptToCodes = [URL: PromptToCode]()
+    private(set) var promptToCode: PromptToCode?
 
     init() {}
 
@@ -57,7 +57,7 @@ final class WidgetDataSource {
                 service: service,
                 name: name,
                 onClosePromptToCode: { [weak self] in
-                    self?.removePromptToCode(for: url)
+                    self?.removePromptToCode()
                     let presenter = PresentInWindowSuggestionPresenter()
                     presenter.closePromptToCode(fileURL: url)
                     if let app = ActiveApplicationMonitor.shared.previousApp, app.isXcode {
@@ -72,16 +72,16 @@ final class WidgetDataSource {
         }
 
         let newPromptToCode = build()
-        promptToCodes[url] = newPromptToCode
+        promptToCode = newPromptToCode
         return newPromptToCode.promptToCodeService
     }
 
-    func removePromptToCode(for url: URL) {
-        promptToCodes[url] = nil
+    func removePromptToCode() {
+        promptToCode = nil
     }
 
     func cleanup(for url: URL) {
-        removePromptToCode(for: url)
+//        removePromptToCode(for: url)
     }
 }
 
@@ -140,7 +140,7 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
     }
 
     func promptToCodeForFile(at url: URL) async -> PromptToCodeProvider? {
-        return promptToCodes[url]?.provider
+        return promptToCode?.provider
     }
 }
 

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -136,14 +136,6 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         defer { presenter.markAsProcessing(false) }
         let fileURL = try await Environment.fetchCurrentFileURL()
 
-        let dataSource = Service.shared.guiController.widgetDataSource
-
-        if await dataSource.promptToCodes[fileURL]?.promptToCodeService != nil {
-            await dataSource.removePromptToCode(for: fileURL)
-            presenter.closePromptToCode(fileURL: fileURL)
-            return
-        }
-
         let (workspace, _) = try await Service.shared.workspacePool
             .fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
         workspace.rejectSuggestion(forFileAt: fileURL, editor: editor)
@@ -164,8 +156,6 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         var cursorPosition = editor.cursorPosition
         var extraInfo = SuggestionInjector.ExtraInfo()
 
-        let dataSource = Service.shared.guiController.widgetDataSource
-
         if let acceptedSuggestion = workspace.acceptSuggestion(
             forFileAt: fileURL,
             editor: editor
@@ -202,7 +192,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
         let dataSource = Service.shared.guiController.widgetDataSource
 
-        if let service = await dataSource.promptToCodes[fileURL]?.promptToCodeService {
+        if let service = await dataSource.promptToCode?.promptToCodeService {
             let rangeStart = service.selectionRange?.start ?? editor.cursorPosition
 
             let suggestion = CodeSuggestion(
@@ -230,7 +220,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
                 )
                 presenter.presentPromptToCode(fileURL: fileURL)
             } else {
-                await dataSource.removePromptToCode(for: fileURL)
+                await dataSource.removePromptToCode()
                 presenter.closePromptToCode(fileURL: fileURL)
             }
 

Core/Sources/Service/XPCService.swift

@@ -108,7 +108,7 @@ public class XPCService: NSObject, XPCServiceProtocol {
         withReply reply: @escaping (Data?, Error?) -> Void
     ) {
         replyWithUpdatedContent(editorContent: editorContent, withReply: reply) { handler, editor in
-            try await handler.acceptSuggestion(editor: editor)
+            try await handler.acceptPromptToCode(editor: editor)
         }
     }
 

Core/Tests/ActiveDocumentChatContextCollectorTests/SwiftFocusedCodeFinderTests.swift

@@ -1,6 +1,7 @@
 import Foundation
 import SuggestionModel
 import XCTest
+import FocusedCodeFinder
 
 @testable import ActiveDocumentChatContextCollector
 

Tool/Sources/FocusedCodeFinder/FocusedCodeFinder.swift

@@ -28,6 +28,20 @@ public struct CodeContext: Equatable {
     public static var empty: CodeContext {
         .init(scope: .file, contextRange: .zero, focusedRange: .zero, focusedCode: "", imports: [])
     }
+
+    public init(
+        scope: Scope,
+        contextRange: CursorRange,
+        focusedRange: CursorRange,
+        focusedCode: String,
+        imports: [String]
+    ) {
+        self.scope = scope
+        self.contextRange = contextRange
+        self.focusedRange = focusedRange
+        self.focusedCode = focusedCode
+        self.imports = imports
+    }
 }
 
 public protocol FocusedCodeFinder {