Merge branch 'feature/continous-prompt-to-code' into develop

Author: intitni

Core/Sources/CopilotModel/ExportedFromLSP.swift

@@ -9,4 +9,7 @@ public extension CursorPosition {
 
 public extension CursorRange {
     static var outOfScope: CursorRange { .init(start: .outOfScope, end: .outOfScope) }
+    static func cursor(_ position: CursorPosition) -> CursorRange {
+        return .init(start: position, end: position)
+    }
 }

Core/Sources/PromptToCodeService/PromptToCodeService.swift

@@ -15,6 +15,7 @@ public final class PromptToCodeService: ObservableObject {
     @Published public var code: String
     @Published public var isResponding: Bool = false
     @Published public var description: String = ""
+    @Published public var isContinuous = false
     public var oldDescription: String?
     public var canRevert: Bool { oldCode != nil }
     public var selectionRange: CursorRange
@@ -40,15 +41,15 @@ public final class PromptToCodeService: ObservableObject {
         let api = promptToCodeAPI
         runningAPI = api
         isResponding = true
-        let toBemodified = code
+        let toBeModified = code
         oldDescription = description
         oldCode = code
         code = ""
         description = ""
         defer { isResponding = false }
         do {
             let stream = try await api.modifyCode(
-                code: toBemodified,
+                code: toBeModified,
                 language: language,
                 indentSize: indentSize,
                 usesTabsForIndentation: usesTabsForIndentation,
@@ -60,7 +61,13 @@ public final class PromptToCodeService: ObservableObject {
                     description = fragment.description
                 }
             }
+        } catch is CancellationError {
+            return
         } catch {
+            if (error as NSError).code == NSURLErrorCancelled {
+                return
+            }
+
             if let oldCode {
                 code = oldCode
             }
@@ -80,7 +87,7 @@ public final class PromptToCodeService: ObservableObject {
             description = oldDescription
         }
         self.oldCode = nil
-        self.oldDescription = nil
+        oldDescription = nil
     }
 
     public func generateCompletion() -> CopilotCompletion {
@@ -127,6 +134,9 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
         usesTabsForIndentation: Bool,
         requirement: String
     ) async throws -> AsyncThrowingStream<(code: String, description: String), Error> {
+        let userPreferredLanguage = UserDefaults.shared.value(for: \.chatGPTLanguage)
+        let textLanguage = userPreferredLanguage.isEmpty ? "" : "in \(userPreferredLanguage)"
+
         let prompt = {
             let indentRule = usesTabsForIndentation ? "\(indentSize) tabs" : "\(indentSize) spaces"
             if code.isEmpty {
@@ -137,7 +147,9 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
                     indentRule
                 ).
 
-                Please reply to me start with the code block, followed by a short description in 1-3 sentences about what you did.
+                Please reply to me start with the code block, followed by a short description in 1-3 sentences about what you did \(
+                    textLanguage
+                ).
                 """
             } else {
                 return """
@@ -147,7 +159,9 @@ final class OpenAIPromptToCodeAPI: PromptToCodeAPI {
                     indentRule
                 ).
 
-                Please reply to me start with the code block followed by a short description about what you did in 1-3 sentences.
+                Please reply to me start with the code block followed by a short description about what you did in 1-3 sentences \(
+                    textLanguage
+                ).
 
                 ```
                 \(code)

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

@@ -17,6 +17,7 @@ extension PromptToCodeProvider {
         service.$code.sink(receiveValue: set(\.code)).store(in: &cancellables)
         service.$isResponding.sink(receiveValue: set(\.isResponding)).store(in: &cancellables)
         service.$description.sink(receiveValue: set(\.description)).store(in: &cancellables)
+        service.$isContinuous.sink(receiveValue: set(\.isContinuous)).store(in: &cancellables)
         service.$oldCode.map { $0 != nil }
             .sink(receiveValue: set(\.canRevert)).store(in: &cancellables)
 
@@ -34,6 +35,8 @@ extension PromptToCodeProvider {
             Task { [weak self] in
                 do {
                     try await service.modifyCode(prompt: requirement)
+                } catch is CancellationError {
+                    return
                 } catch {
                     Task { @MainActor [weak self] in
                         self?.errorMessage = error.localizedDescription
@@ -52,6 +55,10 @@ extension PromptToCodeProvider {
                 await handler.acceptSuggestion()
             }
         }
+        
+        onContinuousToggleClick = {
+            service.isContinuous.toggle()
+        }
     }
 
     func set<T>(_ keyPath: WritableKeyPath<PromptToCodeProvider, T>) -> (T) -> Void {

Core/Sources/Service/SuggestionCommandHandler/CommentBaseCommandHandler.swift

@@ -103,7 +103,7 @@ struct CommentBaseCommandHandler: SuggestionCommandHandler {
 
         return .init(
             content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
+            newSelection: .cursor(cursorPosition),
             modifications: extraInfo.modifications
         )
     }

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -70,7 +70,7 @@ struct PseudoCommandHandler {
 
     func acceptSuggestion() async {
         if UserDefaults.shared.value(for: \.acceptSuggestionWithAccessibilityAPI) {
-            guard let xcode = ActiveApplicationMonitor.activeXcode else { return }
+            guard let xcode = ActiveApplicationMonitor.activeXcode ?? ActiveApplicationMonitor.latestXcode else { return }
             let application = AXUIElementCreateApplication(xcode.processIdentifier)
             guard let focusElement = application.focusedElement,
                   focusElement.description == "Source Editor"
@@ -108,8 +108,8 @@ struct PseudoCommandHandler {
                         .presentErrorMessage("Fail to set editor content.")
                 }
 
-                if let cursor = result.newCursor {
-                    var range = convertCursorPositionToRange(cursor, in: result.content)
+                if let selection = result.newSelection {
+                    var range = convertCursorRangeToRange(selection, in: result.content)
                     if let value = AXValueCreate(.cfRange, &range) {
                         AXUIElementSetAttributeValue(
                             focusElement,
@@ -218,21 +218,28 @@ private extension PseudoCommandHandler {
         )
     }
 
-    // a function to convert CursorPosition(line:character:) into a Range(location:length) in given
-    // content
-    func convertCursorPositionToRange(
-        _ cursorPosition: CursorPosition,
+    func convertCursorRangeToRange(
+        _ cursorRange: CursorRange,
         in content: String
     ) -> CFRange {
         let lines = content.breakLines()
-        var count = 0
+        var countS = 0
+        var countE = 0
+        var range = CFRange(location: 0, length: 0)
         for (i, line) in lines.enumerated() {
-            if i == cursorPosition.line {
-                return CFRange(location: count + cursorPosition.character, length: 0)
+            if i == cursorRange.start.line {
+                countS = countS + cursorRange.start.character
+                range.location = countS
+            }
+            if i == cursorRange.end.line {
+                countE = countE + cursorRange.end.character
+                range.length = max(countE - range.location, 0)
+                break
             }
-            count += line.count
+            countS += line.count
+            countE += line.count
         }
-        return CFRange(location: count, length: 0)
+        return range
     }
 }
 

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

@@ -136,61 +136,68 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
     func acceptSuggestion(editor: EditorContent) async throws -> UpdatedContent? {
         presenter.markAsProcessing(true)
         defer { presenter.markAsProcessing(false) }
-        
+
         let fileURL = try await Environment.fetchCurrentFileURL()
         let (workspace, _) = try await Workspace.fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL)
 
-        let result: (suggestion: CopilotCompletion, cleanup: () -> Void)? = {
-            if let service = WidgetDataSource.shared.promptToCodes[fileURL]?.promptToCodeService {
-                return (CopilotCompletion(
-                    text: service.code,
-                    position: service.selectionRange.start,
-                    uuid: UUID().uuidString,
-                    range: service.selectionRange,
-                    displayText: service.code
-                ), {
-                    WidgetDataSource.shared.removePromptToCode(for: fileURL)
-                    presenter.closePromptToCode(fileURL: fileURL)
-                })
-            }
-            
-            if let acceptedSuggestion = workspace.acceptSuggestion(
-                forFileAt: fileURL,
-                editor: editor
-            ) {
-                return (acceptedSuggestion, {
-                    presenter.discardSuggestion(fileURL: fileURL)
-                })
-            }
-            
-            return nil
-        }()
-        
-        guard let result else { return nil }
-        
         let injector = SuggestionInjector()
         var lines = editor.lines
         var cursorPosition = editor.cursorPosition
         var extraInfo = SuggestionInjector.ExtraInfo()
-        injector.rejectCurrentSuggestions(
-            from: &lines,
-            cursorPosition: &cursorPosition,
-            extraInfo: &extraInfo
-        )
-        injector.acceptSuggestion(
-            intoContentWithoutSuggestion: &lines,
-            cursorPosition: &cursorPosition,
-            completion: result.suggestion,
-            extraInfo: &extraInfo
-        )
 
-        result.cleanup()
-        
-        return .init(
-            content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
-            modifications: extraInfo.modifications
-        )
+        if let service = WidgetDataSource.shared.promptToCodes[fileURL]?.promptToCodeService {
+            let suggestion = CopilotCompletion(
+                text: service.code,
+                position: service.selectionRange.start,
+                uuid: UUID().uuidString,
+                range: service.selectionRange,
+                displayText: service.code
+            )
+
+            injector.acceptSuggestion(
+                intoContentWithoutSuggestion: &lines,
+                cursorPosition: &cursorPosition,
+                completion: suggestion,
+                extraInfo: &extraInfo
+            )
+
+            if service.isContinuous {
+                service.selectionRange = .init(
+                    start: service.selectionRange.start,
+                    end: cursorPosition
+                )
+                presenter.presentPromptToCode(fileURL: fileURL)
+            } else {
+                WidgetDataSource.shared.removePromptToCode(for: fileURL)
+                presenter.closePromptToCode(fileURL: fileURL)
+            }
+
+            return .init(
+                content: String(lines.joined(separator: "")),
+                newSelection: .init(start: service.selectionRange.start, end: cursorPosition),
+                modifications: extraInfo.modifications
+            )
+        } else if let acceptedSuggestion = workspace.acceptSuggestion(
+            forFileAt: fileURL,
+            editor: editor
+        ) {
+            injector.acceptSuggestion(
+                intoContentWithoutSuggestion: &lines,
+                cursorPosition: &cursorPosition,
+                completion: acceptedSuggestion,
+                extraInfo: &extraInfo
+            )
+
+            presenter.discardSuggestion(fileURL: fileURL)
+
+            return .init(
+                content: String(lines.joined(separator: "")),
+                newSelection: .cursor(cursorPosition),
+                modifications: extraInfo.modifications
+            )
+        }
+
+        return nil
     }
 
     func presentRealtimeSuggestions(editor: EditorContent) async throws -> UpdatedContent? {
@@ -334,24 +341,30 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         presenter.markAsProcessing(true)
         defer { presenter.markAsProcessing(false) }
         let fileURL = try await Environment.fetchCurrentFileURL()
-        let language = UserDefaults.shared.value(for: \.chatGPTLanguage)
         let codeLanguage = languageIdentifierFromFileURL(fileURL)
-        let code = {
-            guard let selection = editor.selections.last,
-                  selection.start != selection.end else { return "" }
-            return editor.selectedCode(in: selection)
-        }()
+
+        let (code, selection) = {
+            guard var selection = editor.selections.last,
+                  selection.start != selection.end
+            else { return ("", .cursor(editor.cursorPosition)) }
+            if selection.start.line != selection.end.line {
+                // when there are multiple lines start from char 0 so that it can keep the
+                // indentation.
+                selection.start = .init(line: selection.start.line, character: 0)
+            }
+            return (
+                editor.selectedCode(in: selection),
+                .init(
+                    start: .init(line: selection.start.line, character: selection.start.character),
+                    end: .init(line: selection.end.line, character: selection.end.character)
+                )
+            )
+        }() as (String, CursorRange)
 
         _ = await WidgetDataSource.shared.createPromptToCode(
             for: fileURL,
             code: code,
-            selectionRange: editor.selections.last.map { .init(
-                start: $0.start,
-                end: $0.end
-            ) } ?? .init(
-                start: editor.cursorPosition,
-                end: editor.cursorPosition
-            ),
+            selectionRange: selection,
             language: codeLanguage
         )
 

Core/Sources/Service/SuggestionPresenter/PresentInCommentSuggestionPresenter.swift

@@ -25,7 +25,7 @@ struct PresentInCommentSuggestionPresenter {
         guard let completion = await filespace.presentingSuggestion else {
             return .init(
                 content: originalContent,
-                newCursor: cursorPosition,
+                newSelection: .cursor(cursorPosition),
                 modifications: extraInfo.modifications
             )
         }
@@ -40,7 +40,7 @@ struct PresentInCommentSuggestionPresenter {
 
         return .init(
             content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
+            newSelection: .cursor(cursorPosition),
             modifications: extraInfo.modifications
         )
     }
@@ -65,7 +65,7 @@ struct PresentInCommentSuggestionPresenter {
 
         return .init(
             content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
+            newSelection: .cursor(cursorPosition),
             modifications: extraInfo.modifications
         )
     }