Support detaching prompt to code from selection range

Author: intitni

Core/Sources/PromptToCodeService/PromptToCodeService.swift

@@ -39,8 +39,8 @@ public final class PromptToCodeService: ObservableObject {
     @Published public var isResponding: Bool = false
     @Published public var description: String = ""
     @Published public var isContinuous = false
+    @Published public var selectionRange: CursorRange?
     public var canRevert: Bool { history != .empty }
-    public var selectionRange: CursorRange
     public var language: CodeLanguage
     public var indentSize: Int
     public var usesTabsForIndentation: Bool
@@ -52,7 +52,7 @@ public final class PromptToCodeService: ObservableObject {
 
     public init(
         code: String,
-        selectionRange: CursorRange,
+        selectionRange: CursorRange?,
         language: CodeLanguage,
         identSize: Int,
         usesTabsForIndentation: Bool,
@@ -122,16 +122,6 @@ public final class PromptToCodeService: ObservableObject {
         self.description = description
     }
 
-    public func generateCompletion() -> CodeSuggestion {
-        .init(
-            text: code,
-            position: selectionRange.start,
-            uuid: UUID().uuidString,
-            range: selectionRange,
-            displayText: code
-        )
-    }
-
     public func stopResponding() {
         runningAPI?.stopResponding()
         isResponding = false

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

@@ -25,6 +25,7 @@ extension PromptToCodeProvider {
         service.$isContinuous.sink(receiveValue: set(\.isContinuous)).store(in: &cancellables)
         service.$history.map { $0 != .empty }
             .sink(receiveValue: set(\.canRevert)).store(in: &cancellables)
+        service.$selectionRange.sink(receiveValue: set(\.attachedToRange)).store(in: &cancellables)
 
         onCancelTapped = { [cancellables] in
             _ = cancellables
@@ -59,7 +60,7 @@ extension PromptToCodeProvider {
                 let handler = PseudoCommandHandler()
                 await handler.acceptSuggestion()
                 if let app = ActiveApplicationMonitor.shared.previousApp,
-                    app.isXcode,
+                   app.isXcode,
                    !(self?.isContinuous ?? false)
                 {
                     try await Task.sleep(nanoseconds: 200_000_000)
@@ -71,6 +72,14 @@ extension PromptToCodeProvider {
         onContinuousToggleClick = {
             service.isContinuous.toggle()
         }
+        
+        onToggleAttachOrDetachToCode = {
+            if service.selectionRange != nil {
+                service.selectionRange = nil
+            } else {
+                // reset to selected or focused range.
+            }
+        }
     }
 
     func set<T>(_ keyPath: WritableKeyPath<PromptToCodeProvider, T>) -> (T) -> Void {

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -167,11 +167,16 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         let dataSource = Service.shared.guiController.widgetDataSource
 
         if let service = await dataSource.promptToCodes[fileURL]?.promptToCodeService {
+            let rangeStart = service.selectionRange?.start ?? editor.cursorPosition
+            
             let suggestion = CodeSuggestion(
                 text: service.code,
-                position: service.selectionRange.start,
+                position: rangeStart,
                 uuid: UUID().uuidString,
-                range: service.selectionRange,
+                range: service.selectionRange ?? .init(
+                    start: editor.cursorPosition,
+                    end: editor.cursorPosition
+                ),
                 displayText: service.code
             )
 
@@ -184,7 +189,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
             if service.isContinuous {
                 service.selectionRange = .init(
-                    start: service.selectionRange.start,
+                    start: rangeStart,
                     end: cursorPosition
                 )
                 presenter.presentPromptToCode(fileURL: fileURL)
@@ -195,7 +200,7 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
 
             return .init(
                 content: String(lines.joined(separator: "")),
-                newSelection: .init(start: service.selectionRange.start, end: cursorPosition),
+                newSelection: .init(start: rangeStart, end: cursorPosition),
                 modifications: extraInfo.modifications
             )
         } else if let acceptedSuggestion = workspace.acceptSuggestion(

Core/Sources/SuggestionWidget/Providers/PromptToCodeProvider.swift

@@ -24,6 +24,7 @@ public final class PromptToCodeProvider: ObservableObject {
     public var onAcceptSuggestionTapped: () -> Void
     public var onRequirementSent: (String) -> Void
     public var onContinuousToggleClick: () -> Void
+    public var onToggleAttachOrDetachToCode: () -> Void
 
     public init(
         code: String = "",
@@ -41,7 +42,8 @@ public final class PromptToCodeProvider: ObservableObject {
         onCancelTapped: @escaping () -> Void = {},
         onAcceptSuggestionTapped: @escaping () -> Void = {},
         onRequirementSent: @escaping (String) -> Void = { _ in },
-        onContinuousToggleClick: @escaping () -> Void = {}
+        onContinuousToggleClick: @escaping () -> Void = {},
+        onToggleAttachOrDetachToCode: @escaping () -> Void = {}
     ) {
         self.code = code
         self.language = language
@@ -59,6 +61,7 @@ public final class PromptToCodeProvider: ObservableObject {
         self.onAcceptSuggestionTapped = onAcceptSuggestionTapped
         self.onRequirementSent = onRequirementSent
         self.onContinuousToggleClick = onContinuousToggleClick
+        self.onToggleAttachOrDetachToCode = onToggleAttachOrDetachToCode
     }
 
     func revert() {
@@ -84,5 +87,7 @@ public final class PromptToCodeProvider: ObservableObject {
     func acceptSuggestion() { onAcceptSuggestionTapped() }
 
     func toggleContinuous() { onContinuousToggleClick() }
+    
+    func toggleAttachOrDetachToCode() { onToggleAttachOrDetachToCode() }
 }
 

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -31,7 +31,7 @@ extension PromptToCodePanel {
         var body: some View {
             HStack {
                 Button(action: {
-                    provider.acceptSuggestion()
+                    provider.toggleAttachOrDetachToCode()
                 }) {
                     let attachedToRange = provider.attachedToRange
                     let isAttached = attachedToRange != nil