Merge tag '0.32.3' into develop

intitni · intitni · commit d009248126ec · 2024-05-01T15:40:09.000+08:00
diff --git a/Core/Sources/ChatGPTChatTab/ChatPanel.swift b/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()
+                        }
+                    }
             }
         }
     }
diff --git a/Core/Sources/Service/Service.swift b/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 {
diff --git a/ExtensionService/AppDelegate.swift b/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)
         }
     }
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit a5c9fdad71f2827a549b950622c4d74684c05410
+Subproject commit efce3f66adb1e554fe71b58a1ae35648ae0c8390
diff --git a/Tool/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift b/Tool/Sources/ChatContextCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift
@@ -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,
diff --git a/Version.xcconfig b/Version.xcconfig
@@ -1,3 +1,3 @@
 APP_VERSION = 0.32.3
-APP_BUILD = 366
+APP_BUILD = 367
  
diff --git a/appcast.xml b/appcast.xml
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,12 @@ struct ChatPanelMessages: View {`
`45`	`45`	`@State var isScrollToBottomButtonDisplayed = true`
`46`	`46`	`@State var isPinnedToBottom = true`
`47`	`47`	`@Namespace var bottomID`
	`48`	`+ @Namespace var topID`
`48`	`49`	`@Namespace var scrollSpace`
`49`	`50`	`@State var scrollOffset: Double = 0`
`50`	`51`	`@State var listHeight: Double = 0`
	`52`	`+ @State var didScrollToBottomOnAppearOnce = false`
	`53`	`+ @State var isBottomHidden = true`
`51`	`54`	`@Environment(\.isEnabled) var isEnabled`
`52`	`55`
`53`	`56`	`var body: some View {`
`@@ -56,6 +59,7 @@ struct ChatPanelMessages: View {`
`56`	`59`	`List {`
`57`	`60`	`Group {`
`58`	`61`	`Spacer(minLength: 12)`
	`62`	`+ .id(topID)`
`59`	`63`
`60`	`64`	`Instruction(chat: chat)`
`61`	`65`
`@@ -71,10 +75,14 @@ struct ChatPanelMessages: View {`
`71`	`75`	`Spacer(minLength: 12)`
`72`	`76`	`.id(bottomID)`
`73`	`77`	`.onAppear {`
`74`		`- proxy.scrollTo(bottomID, anchor: .bottom)`
	`78`	`+ isBottomHidden = false`
	`79`	`+ if !didScrollToBottomOnAppearOnce {`
	`80`	`+ proxy.scrollTo(bottomID, anchor: .bottom)`
	`81`	`+ didScrollToBottomOnAppearOnce = true`
	`82`	`+ }`
`75`	`83`	`}`
`76`		`- .task {`
`77`		`- proxy.scrollTo(bottomID, anchor: .bottom)`
	`84`	`+ .onDisappear {`
	`85`	`+ isBottomHidden = true`
`78`	`86`	`}`
`79`	`87`	`.background(GeometryReader { geo in`
`80`	`88`	`let offset = geo.frame(in: .named(scrollSpace)).minY`
`@@ -129,10 +137,20 @@ struct ChatPanelMessages: View {`
`129`	`137`	`scrollToBottomButton(proxy: proxy)`
`130`	`138`	`}`
`131`	`139`	`.background {`
`132`		`- PinToBottomHandler(chat: chat, pinnedToBottom: $isPinnedToBottom) {`
	`140`	`+ PinToBottomHandler(`
	`141`	`+ chat: chat,`
	`142`	`+ isBottomHidden: isBottomHidden,`
	`143`	`+ pinnedToBottom: $isPinnedToBottom`
	`144`	`+ ) {`
`133`	`145`	`proxy.scrollTo(bottomID, anchor: .bottom)`
`134`	`146`	`}`
`135`	`147`	`}`
	`148`	`+ .onAppear {`
	`149`	`+ proxy.scrollTo(bottomID, anchor: .bottom)`
	`150`	`+ }`
	`151`	`+ .task {`
	`152`	`+ proxy.scrollTo(bottomID, anchor: .bottom)`
	`153`	`+ }`
`136`	`154`	`}`
`137`	`155`	`}`
`138`	`156`	`.onAppear {`
`@@ -199,6 +217,7 @@ struct ChatPanelMessages: View {`
`199`	`217`
`200`	`218`	`struct PinToBottomHandler: View {`
`201`	`219`	`let chat: StoreOf<Chat>`
	`220`	`+ let isBottomHidden: Bool`
`202`	`221`	`@Binding var pinnedToBottom: Bool`
`203`	`222`	`let scrollToBottom: () -> Void`
`204`	`223`
`@@ -222,7 +241,9 @@ struct ChatPanelMessages: View {`
`222`	`241`	`Task {`
`223`	`242`	`pinnedToBottom = true`
`224`	`243`	`await Task.yield()`
`225`		`- scrollToBottom()`
	`244`	`+ withAnimation(.easeInOut(duration: 0.1)) {`
	`245`	`+ scrollToBottom()`
	`246`	`+ }`
`226`	`247`	`}`
`227`	`248`	`}`
`228`	`249`	`}`
`@@ -233,10 +254,18 @@ struct ChatPanelMessages: View {`
`233`	`254`	`}`
`234`	`255`	`Task {`
`235`	`256`	`await Task.yield()`
`236`		`- scrollToBottom()`
	`257`	`+ withAnimation(.easeInOut(duration: 0.1)) {`
	`258`	`+ scrollToBottom()`
	`259`	`+ }`
`237`	`260`	`}`
`238`	`261`	`}`
`239`	`262`	`}`
	`263`	`+ .onChange(of: isBottomHidden) { value in`
	`264`	`+ // This is important to prevent it from jumping to the top!`
	`265`	`+ if value, pinnedToBottom {`
	`266`	`+ scrollToBottom()`
	`267`	`+ }`
	`268`	`+ }`
`240`	`269`	`}`
`241`	`270`	`}`
`242`	`271`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,14 @@ public final class Service {`
`86`	`86`	`}.store(in: &cancellable)`
`87`	`87`	`}`
`88`	`88`	`}`
	`89`	`+`
	`90`	`+ @MainActor`
	`91`	`+ public func prepareForExit() async {`
	`92`	`+ #if canImport(ProService)`
	`93`	`+ proService.prepareForExit()`
	`94`	`+ #endif`
	`95`	`+ await scheduledCleaner.closeAllChildProcesses()`
	`96`	`+ }`
`89`	`97`	`}`
`90`	`98`
`91`	`99`	`public extension Service {`
Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`-`
	`51`	`+`
`52`	`52`	`@objc func quit() {`
`53`	`53`	`Task { @MainActor in`
`54`		`- await service.scheduledCleaner.closeAllChildProcesses()`
	`54`	`+ await service.prepareForExit()`
`55`	`55`	`exit(0)`
`56`	`56`	`}`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`APP_VERSION = 0.32.3`
`2`		`-APP_BUILD = 366`
	`2`	`+APP_BUILD = 367`
`3`	`3`