Merge branch 'hotfix/0.32.3'

Author: intitni

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -45,9 +45,12 @@ struct ChatPanelMessages: View {
     @State var isScrollToBottomButtonDisplayed = true
     @State var isPinnedToBottom = true
     @Namespace var bottomID
+    @Namespace var topID
     @Namespace var scrollSpace
     @State var scrollOffset: Double = 0
     @State var listHeight: Double = 0
+    @State var didScrollToBottomOnAppearOnce = false
+    @State var isBottomHidden = true
     @Environment(\.isEnabled) var isEnabled
 
     var body: some View {
@@ -56,6 +59,7 @@ struct ChatPanelMessages: View {
                 List {
                     Group {
                         Spacer(minLength: 12)
+                            .id(topID)
 
                         Instruction(chat: chat)
 
@@ -71,10 +75,14 @@ struct ChatPanelMessages: View {
                         Spacer(minLength: 12)
                             .id(bottomID)
                             .onAppear {
-                                proxy.scrollTo(bottomID, anchor: .bottom)
+                                isBottomHidden = false
+                                if !didScrollToBottomOnAppearOnce {
+                                    proxy.scrollTo(bottomID, anchor: .bottom)
+                                    didScrollToBottomOnAppearOnce = true
+                                }
                             }
-                            .task {
-                                proxy.scrollTo(bottomID, anchor: .bottom)
+                            .onDisappear {
+                                isBottomHidden = true
                             }
                             .background(GeometryReader { geo in
                                 let offset = geo.frame(in: .named(scrollSpace)).minY
@@ -129,10 +137,20 @@ struct ChatPanelMessages: View {
                     scrollToBottomButton(proxy: proxy)
                 }
                 .background {
-                    PinToBottomHandler(chat: chat, pinnedToBottom: $isPinnedToBottom) {
+                    PinToBottomHandler(
+                        chat: chat,
+                        isBottomHidden: isBottomHidden,
+                        pinnedToBottom: $isPinnedToBottom
+                    ) {
                         proxy.scrollTo(bottomID, anchor: .bottom)
                     }
                 }
+                .onAppear {
+                    proxy.scrollTo(bottomID, anchor: .bottom)
+                }
+                .task {
+                    proxy.scrollTo(bottomID, anchor: .bottom)
+                }
             }
         }
         .onAppear {
@@ -199,6 +217,7 @@ struct ChatPanelMessages: View {
 
     struct PinToBottomHandler: View {
         let chat: StoreOf<Chat>
+        let isBottomHidden: Bool
         @Binding var pinnedToBottom: Bool
         let scrollToBottom: () -> Void
 
@@ -222,7 +241,9 @@ struct ChatPanelMessages: View {
                             Task {
                                 pinnedToBottom = true
                                 await Task.yield()
-                                scrollToBottom()
+                                withAnimation(.easeInOut(duration: 0.1)) {
+                                    scrollToBottom()
+                                }
                             }
                         }
                     }
@@ -233,10 +254,18 @@ struct ChatPanelMessages: View {
                             }
                             Task {
                                 await Task.yield()
-                                scrollToBottom()
+                                withAnimation(.easeInOut(duration: 0.1)) {
+                                    scrollToBottom()
+                                }
                             }
                         }
                     }
+                    .onChange(of: isBottomHidden) { value in
+                        // This is important to prevent it from jumping to the top!
+                        if value, pinnedToBottom {
+                            scrollToBottom()
+                        }
+                    }
             }
         }
     }

Core/Sources/Service/Service.swift

@@ -86,6 +86,14 @@ public final class Service {
                 }.store(in: &cancellable)
         }
     }
+    
+    @MainActor
+    public func prepareForExit() async {
+        #if canImport(ProService)
+        proService.prepareForExit()
+        #endif
+        await scheduledCleaner.closeAllChildProcesses()
+    }
 }
 
 public extension Service {

ExtensionService/AppDelegate.swift

@@ -48,10 +48,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
             }
         }
     }
-
+    
     @objc func quit() {
         Task { @MainActor in
-            await service.scheduledCleaner.closeAllChildProcesses()
+            await service.prepareForExit()
             exit(0)
         }
     }

Pro

@@ -55,8 +55,7 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
 
             var functionPrompt = """
             ONLY call it when one of the following conditions are satisfied:
-            - the user explicitly ask you about specific line of code, \
-            but the line was NOT in the focused range \(contextLineRange).
+            - the user explicitly ask you about specific line of code, that is NOT in the focused range \(contextLineRange).
             """
 
             if let annotations = context.focusedContext?.otherLineAnnotations,

Tool/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift

@@ -1,3 +1,3 @@
 APP_VERSION = 0.32.3
-APP_BUILD = 366
+APP_BUILD = 367
 

Version.xcconfig

@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.32.3</title>
+      <pubDate>Wed, 01 May 2024 15:35:26 +0800</pubDate>
+      <sparkle:version>367</sparkle:version>
+      <sparkle:shortVersionString>0.32.3</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.32.3
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.32.3/Copilot.for.Xcode.app.zip" length="41425304" type="application/octet-stream" sparkle:edSignature="6lv4UNZaPTQDUvdjnfFhzThKc3fxhK9KOvyZMjzUfMZ0Jyg75vSNfY1plBrWLAKbvRLuiS9emANLEGlXd+whAA=="/>
+    </item>
+
     <item>
       <title>0.32.3</title>
       <pubDate>Mon, 29 Apr 2024 22:44:05 +0800</pubDate>