Merge tag '0.17.0' into develop

Author: intitni

Core/Sources/CodeiumService/CodeiumService.swift

@@ -56,6 +56,8 @@ public class CodeiumSuggestionService {
 
     var xcodeVersion = "14.0.0"
     var languageServerVersion = CodeiumInstallationManager.latestSupportedVersion
+    
+    private var ongoingTasks = Set<Task<[CodeSuggestion], Error>>()
 
     init(designatedServer: CodeiumLSP) {
         projectRootURL = URL(fileURLWithPath: "/")
@@ -226,83 +228,85 @@ extension CodeiumSuggestionService: CodeiumSuggestionServiceType {
         usesTabsForIndentation: Bool,
         ignoreSpaceOnlySuggestions: Bool
     ) async throws -> [CodeSuggestion] {
+        ongoingTasks.forEach { $0.cancel() }
+        ongoingTasks.removeAll()
+        await cancelRequest()
+        
         requestCounter += 1
         let languageId = languageIdentifierFromFileURL(fileURL)
-
         let relativePath = getRelativePath(of: fileURL)
-
-        let request = await CodeiumRequest.GetCompletion(requestBody: .init(
-            metadata: try getMetadata(),
-            document: .init(
-                absolute_path: fileURL.path,
-                relative_path: relativePath,
-                text: content,
-                editor_language: languageId.rawValue,
-                language: .init(codeLanguage: languageId),
-                cursor_position: .init(
-                    row: cursorPosition.line,
-                    col: cursorPosition.character
-                )
-            ),
-            editor_options: .init(tab_size: indentSize, insert_spaces: !usesTabsForIndentation),
-            other_documents: openedDocumentPool.getOtherDocuments(exceptURL: fileURL)
-                .map { openedDocument in
-                    let languageId = languageIdentifierFromFileURL(openedDocument.url)
-                    return .init(
-                        absolute_path: openedDocument.url.path,
-                        relative_path: openedDocument.relativePath,
-                        text: openedDocument.content,
-                        editor_language: languageId.rawValue,
-                        language: .init(codeLanguage: languageId)
+        
+        let task = Task {
+            let request = await CodeiumRequest.GetCompletion(requestBody: .init(
+                metadata: try getMetadata(),
+                document: .init(
+                    absolute_path: fileURL.path,
+                    relative_path: relativePath,
+                    text: content,
+                    editor_language: languageId.rawValue,
+                    language: .init(codeLanguage: languageId),
+                    cursor_position: .init(
+                        row: cursorPosition.line,
+                        col: cursorPosition.character
                     )
-                }
-        ))
-
-        if request.requestBody.metadata.request_id <= cancellationCounter {
-            throw CancellationError()
-        }
+                ),
+                editor_options: .init(tab_size: indentSize, insert_spaces: !usesTabsForIndentation),
+                other_documents: openedDocumentPool.getOtherDocuments(exceptURL: fileURL)
+                    .map { openedDocument in
+                        let languageId = languageIdentifierFromFileURL(openedDocument.url)
+                        return .init(
+                            absolute_path: openedDocument.url.path,
+                            relative_path: openedDocument.relativePath,
+                            text: openedDocument.content,
+                            editor_language: languageId.rawValue,
+                            language: .init(codeLanguage: languageId)
+                        )
+                    }
+            ))
+            
+            try Task.checkCancellation()
 
-        let result = try await (try await setupServerIfNeeded()).sendRequest(request)
+            let result = try await (try await setupServerIfNeeded()).sendRequest(request)
+            
+            try Task.checkCancellation()
 
-        if request.requestBody.metadata.request_id <= cancellationCounter {
-            throw CancellationError()
+            return result.completionItems?.filter { item in
+                if ignoreSpaceOnlySuggestions {
+                    return !item.completion.text.allSatisfy { $0.isWhitespace || $0.isNewline }
+                }
+                return true
+            }.map { item in
+                CodeSuggestion(
+                    text: item.completion.text,
+                    position: cursorPosition,
+                    uuid: item.completion.completionId,
+                    range: CursorRange(
+                        start: .init(
+                            line: item.range.startPosition?.row.flatMap(Int.init) ?? 0,
+                            character: item.range.startPosition?.col.flatMap(Int.init) ?? 0
+                        ),
+                        end: .init(
+                            line: item.range.endPosition?.row.flatMap(Int.init) ?? 0,
+                            character: item.range.endPosition?.col.flatMap(Int.init) ?? 0
+                        )
+                    ),
+                    displayText: item.completion.text
+                )
+            } ?? []
         }
+        
+        ongoingTasks.insert(task)
 
-        return result.completionItems?.filter { item in
-            if ignoreSpaceOnlySuggestions {
-                return !item.completion.text.allSatisfy { $0.isWhitespace || $0.isNewline }
-            }
-            return true
-        }.map { item in
-            CodeSuggestion(
-                text: item.completion.text,
-                position: cursorPosition,
-                uuid: item.completion.completionId,
-                range: CursorRange(
-                    start: .init(
-                        line: item.range.startPosition?.row.flatMap(Int.init) ?? 0,
-                        character: item.range.startPosition?.col.flatMap(Int.init) ?? 0
-                    ),
-                    end: .init(
-                        line: item.range.endPosition?.row.flatMap(Int.init) ?? 0,
-                        character: item.range.endPosition?.col.flatMap(Int.init) ?? 0
-                    )
-                ),
-                displayText: item.completion.text
-            )
-        } ?? []
+        return try await task.value
     }
 
     public func cancelRequest() async {
-        Task {
-            try await server?.sendRequest(
-                CodeiumRequest.CancelRequest(requestBody: .init(
-                    request_id: requestCounter,
-                    session_id: CodeiumSuggestionService.sessionId
-                ))
-            )
-        }
-        cancellationCounter = requestCounter
+        _ = try? await server?.sendRequest(
+            CodeiumRequest.CancelRequest(requestBody: .init(
+                request_id: requestCounter,
+                session_id: CodeiumSuggestionService.sessionId
+            ))
+        )
     }
 
     public func notifyAccepted(_ suggestion: CodeSuggestion) async {

Core/Sources/Environment/Environment.swift

@@ -114,9 +114,7 @@ public enum Environment {
     public static var fetchFocusedElementURI: () async throws -> URL = {
         guard let xcode = ActiveApplicationMonitor.activeXcode
             ?? ActiveApplicationMonitor.latestXcode
-        else {
-            throw FailedToFetchFileURLError()
-        }
+        else { return URL(fileURLWithPath: "/global") }
 
         let application = AXUIElementCreateApplication(xcode.processIdentifier)
         let focusedElement = application.focusedElement

Core/Sources/OpenAIService/ChatGPTService.swift

@@ -188,7 +188,7 @@ public actor ChatGPTService: ChatGPTServiceType {
                             continuation.yield(content)
                         }
 
-                        try await Task.sleep(nanoseconds: 2_000_000)
+                        try await Task.sleep(nanoseconds: 3_500_000)
                     }
 
                     continuation.finish()

Core/Sources/Service/RealtimeSuggestionController.swift

@@ -131,10 +131,10 @@ public class RealtimeSuggestionController {
             for await notification in notificationsFromEditor {
                 guard let self else { return }
                 try Task.checkCancellation()
-                await cancelInFlightTasks()
 
                 switch notification.name {
                 case kAXValueChangedNotification:
+                    await cancelInFlightTasks()
                     self.triggerPrefetchDebounced()
                     await self.notifyEditingFileChange(editor: focusElement)
                 case kAXSelectedTextChangedNotification:
@@ -210,7 +210,6 @@ public class RealtimeSuggestionController {
                 let isEnabled = workspace.isSuggestionFeatureEnabled
                 if !isEnabled { return }
             }
-
             if Task.isCancelled { return }
 
             Logger.service.info("Prefetch suggestions.")

Core/Sources/ServiceUpdateMigration/ServiceUpdateMigrator.swift

@@ -29,7 +29,7 @@ public struct ServiceUpdateMigrator {
             try migrateFromLowerThanOrEqualToVersion135()
         }
 
-        if old <= 170 {
+        if old < 170 {
             try migrateFromLowerThanOrEqualToVersion170()
         }
     }
@@ -89,7 +89,6 @@ func migrateFromLowerThanOrEqualToVersion170() throws {
        let key = try? oldKeychain.getString("codeiumKey")
     {
         try newKeychain.set(key, key: "codeiumAuthKey")
-        try? oldKeychain.set("", key: "codeiumKey")
     }
 }
 

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlock.swift

@@ -42,11 +42,11 @@ struct CodeBlock: View {
     @ViewBuilder
     func vstack(@ViewBuilder content: () -> some View) -> some View {
         if disableLazyVStack {
-            VStack(spacing: 4) {
+            VStack(spacing: 2) {
                 content()
             }
         } else {
-            LazyVStack(spacing: 4) {
+            LazyVStack(spacing: 2) {
                 content()
             }
         }
@@ -78,7 +78,7 @@ struct CodeBlock: View {
             }
         }
         .foregroundColor(.white)
-        .font(.system(size: 12, design: .monospaced))
+        .font(.system(size: fontSize, design: .monospaced))
         .padding(.leading, 4)
         .padding([.trailing, .top, .bottom])
     }
@@ -99,3 +99,22 @@ struct CodeBlock: View {
         )
     }
 }
+
+// MARK: - Preview
+
+struct CodeBlock_Previews: PreviewProvider {
+    static var previews: some View {
+        CodeBlock(
+            code: """
+            let foo = Foo()
+            let bar = Bar()
+            """,
+            language: "swift",
+            startLineIndex: 0,
+            colorScheme: .dark,
+            firstLinePrecedingSpaceCount: 0,
+            fontSize: 12
+        )
+    }
+}
+

Core/Tests/OpenAIServiceTests/ChatGPTServiceTests.swift

@@ -41,7 +41,7 @@ final class ChatGPTServiceTests: XCTestCase {
             return "\(idCounter)"
         }
         var requestBody: CompletionRequestBody?
-        await service.changeBuildCompletionStreamAPI { _apiKey, _, _requestBody in
+        await service.changeBuildCompletionStreamAPI { _apiKey, _, _, _requestBody  in
             requestBody = _requestBody
             return MockCompletionStreamAPI_Success()
         }

Core/Tests/ServiceTests/Environment.swift

@@ -34,6 +34,10 @@ func completion(text: String, range: CursorRange, uuid: String = "") -> CodeSugg
 }
 
 class MockSuggestionService: GitHubCopilotSuggestionServiceType {
+    func terminate() async {
+        fatalError()
+    }
+    
     func cancelRequest() async {
         fatalError()
     }

README.md

@@ -179,7 +179,6 @@ You can detach the chat panel by simply dragging it away. Once detached, the cha
 #### Commands
 
 - Open Chat: Open a chat window.
-- Explain Selection: Open a chat window and explain the selected code.
 
 #### Keyboard Shortcuts
 
@@ -234,7 +233,11 @@ This feature is recommended when you need to update a specific piece of code. So
 
 ### Custom Commands
 
-You can create custom commands that run Chat and Prompt to Code with personalized prompts. These commands are easily accessible from both the Xcode menu bar and the context menu of the circular widget. 
+You can create custom commands that run Chat and Prompt to Code with personalized prompts. These commands are easily accessible from both the Xcode menu bar and the context menu of the circular widget. There are 3 types of custom commands:
+
+- Prompt to Code: Run Prompt to Code with the selected code, and update or write the code using the given prompt, if provided. You can provide additional information through the extra system prompt field.
+- Open Chat: Open the chat window and immediately send a message, if provided. You can provide more information through the extra system prompt field.
+- Custom Chat: Open the chat window and immediately send a message, if provided. You can overwrite the entire system prompt through the system prompt field.
 
 ## Key Bindings
 

Version.xcconfig

@@ -1,2 +1,2 @@
-APP_VERSION = 0.16.1
-APP_BUILD = 161
+APP_VERSION = 0.17.0
+APP_BUILD = 170