Merge branch 'release/0.23.0'

Author: intitni

Copilot for Xcode.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		C8009BFF2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8009BFE2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift */; };
 		C8009C032941C576007AA7E8 /* RealtimeSuggestionCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C8009C022941C576007AA7E8 /* RealtimeSuggestionCommand.swift */; };
 		C800DBB1294C624D00B04CAC /* PrefetchSuggestionsCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */; };
+		C80FFB962A95F58200704A25 /* AcceptPromptToCodeCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = C80FFB952A95F58200704A25 /* AcceptPromptToCodeCommand.swift */; };
 		C81291D72994FE6900196E12 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C81291D52994FE6900196E12 /* Main.storyboard */; };
 		C814588F2939EFDC00135263 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C814588E2939EFDC00135263 /* Cocoa.framework */; };
 		C81458942939EFDC00135263 /* SourceEditorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81458932939EFDC00135263 /* SourceEditorExtension.swift */; };
@@ -139,6 +140,7 @@
 		C8009BFE2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToggleRealtimeSuggestionsCommand.swift; sourceTree = "<group>"; };
 		C8009C022941C576007AA7E8 /* RealtimeSuggestionCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealtimeSuggestionCommand.swift; sourceTree = "<group>"; };
 		C800DBB0294C624D00B04CAC /* PrefetchSuggestionsCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrefetchSuggestionsCommand.swift; sourceTree = "<group>"; };
+		C80FFB952A95F58200704A25 /* AcceptPromptToCodeCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AcceptPromptToCodeCommand.swift; sourceTree = "<group>"; };
 		C81291D52994FE6900196E12 /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		C81291D92994FE7900196E12 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		C814588C2939EFDC00135263 /* Copilot.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Copilot.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -241,6 +243,7 @@
 				C8520300293C4D9000460097 /* Helpers.swift */,
 				C81458952939EFDC00135263 /* GetSuggestionsCommand.swift */,
 				C87B03A4293B261200C77EAE /* AcceptSuggestionCommand.swift */,
+				C80FFB952A95F58200704A25 /* AcceptPromptToCodeCommand.swift */,
 				C87B03A6293B261900C77EAE /* RejectSuggestionCommand.swift */,
 				C87B03A8293B262600C77EAE /* NextSuggestionCommand.swift */,
 				C87B03AA293B262E00C77EAE /* PreviousSuggestionCommand.swift */,
@@ -557,6 +560,7 @@
 				C861A6A329E5503F005C41A3 /* PromptToCodeCommand.swift in Sources */,
 				C8520301293C4D9000460097 /* Helpers.swift in Sources */,
 				C8009BFF2941C551007AA7E8 /* ToggleRealtimeSuggestionsCommand.swift in Sources */,
+				C80FFB962A95F58200704A25 /* AcceptPromptToCodeCommand.swift in Sources */,
 				C87B03A5293B261200C77EAE /* AcceptSuggestionCommand.swift in Sources */,
 				C87B03A9293B262600C77EAE /* NextSuggestionCommand.swift in Sources */,
 				C87B03AB293B262E00C77EAE /* PreviousSuggestionCommand.swift in Sources */,

Copilot for Xcode.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -50,7 +50,6 @@ let package = Package(
             url: "https://github.com/pointfreeco/swift-composable-architecture",
             from: "0.55.0"
         ),
-        .package(url: "https://github.com/apple/swift-syntax.git", branch: "main"),
     ].pro,
     targets: [
         // MARK: - Main
@@ -158,9 +157,11 @@ let package = Package(
         .target(
             name: "PromptToCodeService",
             dependencies: [
+                .product(name: "FocusedCodeFinder", package: "Tool"),
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
+                .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
             ]
         ),
         .testTarget(name: "PromptToCodeServiceTests", dependencies: ["PromptToCodeService"]),
@@ -227,6 +228,7 @@ let package = Package(
         .target(
             name: "SuggestionWidget",
             dependencies: [
+                "PromptToCodeService",
                 "ChatGPTChatTab",
                 .product(name: "UserDefaultsObserver", package: "Tool"),
                 .product(name: "SharedUIComponents", package: "Tool"),
@@ -258,6 +260,13 @@ let package = Package(
             dependencies: [
                 "GitHubCopilotService",
                 .product(name: "Preferences", package: "Tool"),
+                .product(name: "Keychain", package: "Tool"),
+            ]
+        ),
+        .testTarget(
+            name: "ServiceUpdateMigrationTests",
+            dependencies: [
+                "ServiceUpdateMigration",
             ]
         ),
         .target(
@@ -361,12 +370,9 @@ let package = Package(
             name: "ActiveDocumentChatContextCollector",
             dependencies: [
                 "ChatContextCollector",
-                .product(name: "LangChain", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
                 .product(name: "Preferences", package: "Tool"),
-                .product(name: "ASTParser", package: "Tool"),
-                .product(name: "SwiftSyntax", package: "swift-syntax"),
-                .product(name: "SwiftParser", package: "swift-syntax"),
+                .product(name: "FocusedCodeFinder", package: "Tool"),
             ],
             path: "Sources/ChatContextCollectors/ActiveDocumentChatContextCollector"
         ),

Core/Package.swift

@@ -14,7 +14,8 @@ public protocol ChatContextCollector {
     func generateContext(
         history: [ChatMessage],
         scopes: Set<String>,
-        content: String
+        content: String,
+        configuration: ChatGPTConfiguration
     ) -> ChatContext?
 }
 

Core/Sources/ChatContextCollector/ChatContextCollector.swift

@@ -1,5 +1,6 @@
 import ASTParser
 import ChatContextCollector
+import FocusedCodeFinder
 import Foundation
 import OpenAIService
 import Preferences
@@ -14,7 +15,8 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
     public func generateContext(
         history: [ChatMessage],
         scopes: Set<String>,
-        content: String
+        content: String,
+        configuration: ChatGPTConfiguration
     ) -> ChatContext? {
         guard let info = getEditorInformation() else { return nil }
         let context = getActiveDocumentContext(info)
@@ -188,107 +190,3 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
     }
 }
 
-struct ActiveDocumentContext {
-    var filePath: String
-    var relativePath: String
-    var language: CodeLanguage
-    var fileContent: String
-    var lines: [String]
-    var selectedCode: String
-    var selectionRange: CursorRange
-    var lineAnnotations: [EditorInformation.LineAnnotation]
-    var imports: [String]
-
-    struct FocusedContext {
-        var context: [String]
-        var contextRange: CursorRange
-        var codeRange: CursorRange
-        var code: String
-        var lineAnnotations: [EditorInformation.LineAnnotation]
-        var otherLineAnnotations: [EditorInformation.LineAnnotation]
-    }
-
-    var focusedContext: FocusedContext?
-
-    mutating func moveToFocusedCode() {
-        moveToCodeContainingRange(selectionRange)
-    }
-
-    mutating func moveToCodeAroundLine(_ line: Int) {
-        moveToCodeContainingRange(.init(
-            start: .init(line: line, character: 0),
-            end: .init(line: line, character: 0)
-        ))
-    }
-
-    mutating func expandFocusedRangeToContextRange() {
-        guard let focusedContext else { return }
-        moveToCodeContainingRange(focusedContext.contextRange)
-    }
-
-    mutating func moveToCodeContainingRange(_ range: CursorRange) {
-        let finder: FocusedCodeFinder = {
-            switch language {
-            case .builtIn(.swift):
-                return SwiftFocusedCodeFinder()
-            default:
-                return UnknownLanguageFocusedCodeFinder(proposedSearchRange: 5)
-            }
-        }()
-
-        let codeContext = finder.findFocusedCode(
-            containingRange: range,
-            activeDocumentContext: self
-        )
-
-        imports = codeContext.imports
-
-        let startLine = codeContext.focusedRange.start.line
-        let endLine = codeContext.focusedRange.end.line
-        var matchedAnnotations = [EditorInformation.LineAnnotation]()
-        var otherAnnotations = [EditorInformation.LineAnnotation]()
-        for annotation in lineAnnotations {
-            if annotation.line >= startLine, annotation.line <= endLine {
-                matchedAnnotations.append(annotation)
-            } else {
-                otherAnnotations.append(annotation)
-            }
-        }
-
-        focusedContext = .init(
-            context: codeContext.scopeSignatures,
-            contextRange: codeContext.contextRange,
-            codeRange: codeContext.focusedRange,
-            code: codeContext.focusedCode,
-            lineAnnotations: matchedAnnotations,
-            otherLineAnnotations: otherAnnotations
-        )
-    }
-
-    mutating func update(_ info: EditorInformation) {
-        /// Whenever the file content, relative path, or selection range changes,
-        /// we should reset the context.
-        let changed: Bool = {
-            if info.relativePath != relativePath { return true }
-            if info.editorContent?.content != fileContent { return true }
-            if let range = info.editorContent?.selections.first,
-               range != selectionRange { return true }
-            return false
-        }()
-
-        filePath = info.documentURL.path
-        relativePath = info.relativePath
-        language = info.language
-        fileContent = info.editorContent?.content ?? ""
-        lines = info.editorContent?.lines ?? []
-        selectedCode = info.selectedContent
-        selectionRange = info.editorContent?.selections.first ?? .zero
-        lineAnnotations = info.editorContent?.lineAnnotations ?? []
-        imports = []
-
-        if changed {
-            moveToFocusedCode()
-        }
-    }
-}
-

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift

@@ -3,39 +3,6 @@ import SuggestionModel
 import XcodeInspector
 
 func getEditorInformation() -> EditorInformation? {
-    guard !XcodeInspector.shared.xcodes.isEmpty else { return nil }
-    
-    let editorContent = XcodeInspector.shared.focusedEditor?.content
-    let documentURL = XcodeInspector.shared.activeDocumentURL
-    let projectURL = XcodeInspector.shared.activeProjectURL
-    let language = languageIdentifierFromFileURL(documentURL)
-    let relativePath = documentURL.path
-        .replacingOccurrences(of: projectURL.path, with: "")
-
-    if let editorContent, let range = editorContent.selections.first {
-        let (selectedContent, selectedLines) = EditorInformation.code(
-            in: editorContent.lines,
-            inside: range
-        )
-        return .init(
-            editorContent: editorContent,
-            selectedContent: selectedContent,
-            selectedLines: selectedLines,
-            documentURL: documentURL,
-            projectURL: projectURL,
-            relativePath: relativePath,
-            language: language
-        )
-    }
-
-    return .init(
-        editorContent: editorContent,
-        selectedContent: "",
-        selectedLines: [],
-        documentURL: documentURL,
-        projectURL: projectURL,
-        relativePath: relativePath,
-        language: language
-    )
+    return XcodeInspector.shared.focusedEditorContent
 }
 

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/GetEditorInfo.swift

@@ -11,7 +11,8 @@ public struct LegacyActiveDocumentChatContextCollector: ChatContextCollector {
     public func generateContext(
         history: [ChatMessage],
         scopes: Set<String>,
-        content: String
+        content: String,
+        configuration: ChatGPTConfiguration
     ) -> ChatContext? {
         guard let content = getEditorInformation() else { return nil }
         let relativePath = content.relativePath

Core/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/LegacyActiveDocumentChatContextCollector.swift

@@ -14,7 +14,8 @@ public final class SystemInfoChatContextCollector: ChatContextCollector {
     public func generateContext(
         history: [ChatMessage],
         scopes: Set<String>,
-        content: String
+        content: String,
+        configuration: ChatGPTConfiguration
     ) -> ChatContext? {
         return .init(
             systemPrompt: """

Core/Sources/ChatContextCollectors/SystemInfoChatContextCollector/SystemInfoChatContextCollector.swift

@@ -28,6 +28,8 @@ struct SearchFunction: ChatGPTFunction {
             }.joined(separator: "\n")
         }
     }
+    
+    let maxTokens: Int
 
     var reportProgress: (String) async -> Void = { _ in }
 
@@ -72,9 +74,10 @@ struct SearchFunction: ChatGPTFunction {
                 subscriptionKey: UserDefaults.shared.value(for: \.bingSearchSubscriptionKey),
                 searchURL: UserDefaults.shared.value(for: \.bingSearchEndpoint)
             )
+            
             let result = try await bingSearch.search(
                 query: arguments.query,
-                numberOfResult: UserDefaults.shared.value(for: \.chatGPTMaxToken) > 5000 ? 5 : 3,
+                numberOfResult: maxTokens > 5000 ? 5 : 3,
                 freshness: arguments.freshness
             )
 

Core/Sources/ChatContextCollectors/WebChatContextCollector/SearchFunction.swift

@@ -10,12 +10,13 @@ public final class WebChatContextCollector: ChatContextCollector {
     public func generateContext(
         history: [ChatMessage],
         scopes: Set<String>,
-        content: String
+        content: String,
+        configuration: ChatGPTConfiguration
     ) -> ChatContext? {
         guard scopes.contains("web") || scopes.contains("w") else { return nil }
         let links = Self.detectLinks(from: history) + Self.detectLinks(from: content)
         let functions: [(any ChatGPTFunction)?] = [
-            SearchFunction(),
+            SearchFunction(maxTokens: configuration.maxTokens),
             // allow this function only when there is a link in the memory.
             links.isEmpty ? nil : QueryWebsiteFunction(),
         ]