Merge branch 'hotfix/0.32.3.beta'

intitni · Apr 29, 2024 · 52ae306 · 52ae306
2 parents 12e0844 + 63c3bed
commit 52ae306
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/Core/Sources/ChatGPTChatTab/ChatPanel.swift b/Core/Sources/ChatGPTChatTab/ChatPanel.swift
@@ -219,8 +219,11 @@ struct ChatPanelMessages: View {
  EmptyView()
  .onChange(of: viewStore.state.isReceivingMessage) { isReceiving in
  if isReceiving {
- pinnedToBottom = true
- scrollToBottom()
+ Task {
+ pinnedToBottom = true
+ await Task.yield()
+ scrollToBottom()
+ }
  }
  }
  .onChange(of: viewStore.state.lastMessage) { _ in

diff --git a/Pro b/Pro
diff --git a/...extCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift b/...extCollectors/ActiveDocumentChatContextCollector/ActiveDocumentChatContextCollector.swift
@@ -46,10 +46,17 @@ public final class ActiveDocumentChatContextCollector: ChatContextCollector {
  var functions = [any ChatGPTFunction]()
 
  if !isSensitive {
+ let contextLineRange: String = {
+ if let range = context.focusedContext?.codeRange {
+ return " from \(range.start.line + 1) to \(range.end.line + 1)"
+ }
+ return ""
+ }()
+
  var functionPrompt = """
  ONLY call it when one of the following conditions are satisfied:
- - the user ask you about specific line from the latest message, \
- which is not included in the focused range.
+ - the user explicitly ask you about specific line of code, \
+ but the line was 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.2
-APP_BUILD = 363
+APP_VERSION = 0.32.3
+APP_BUILD = 366
 
diff --git a/appcast.xml b/appcast.xml
@@ -3,6 +3,19 @@
  <channel>
  <title>Copilot for Xcode</title>
 
+ <item>
+ <title>0.32.3</title>
+ <pubDate>Mon, 29 Apr 2024 22:44:05 +0800</pubDate>
+ <sparkle:version>366</sparkle:version>
+ <sparkle:channel>beta</sparkle:channel>
+ <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.beta
+ </sparkle:releaseNotesLink>
+ <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.32.3.beta/Copilot.for.Xcode.app.zip" length="41418029" type="application/octet-stream" sparkle:edSignature="IkQcMIEeImDH8OoqTmfehonuJZHfchW0lWU1vN4xMqXMmwHz7wdjXO7rTz6LoC2LNlY0KfTfOzenAJEXNoGDAA=="/>
+ </item>
+
  <item>
  <title>0.32.2</title>
  <pubDate>Sat, 20 Apr 2024 20:31:36 +0800</pubDate>