Merge tag '0.25.0' into develop

intitni · intitni · commit 7fa80a310c3e · 2023-10-11T23:57:31.000+08:00
diff --git a/Core/Package.resolved b/Core/Package.resolved
diff --git a/Core/Package.swift b/Core/Package.swift
@@ -38,12 +38,15 @@ let isProIncluded: Bool = {
             return false
         }
         do {
-            let content = String(
+            if let content = String(
                 data: try Data(contentsOf: confURL),
                 encoding: .utf8
-            )
-            print("")
-            return content?.hasPrefix("YES") ?? false
+            ) {
+                if content.hasPrefix("YES") {
+                    return true
+                }
+            }
+            return false
         } catch {
             return false
         }
diff --git a/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift b/Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift
@@ -65,7 +65,7 @@ struct GUI: ReducerProtocol {
     }
 
     @Dependency(\.chatTabPool) var chatTabPool: ChatTabPool
-    
+
     public enum Debounce: Hashable {
         case updateChatTabOrder
     }
@@ -224,11 +224,13 @@ struct GUI: ReducerProtocol {
                 guard old.map(\.id) != new.map(\.id) else {
                     return .none
                 }
+                #if canImport(ChatTabPersistent)
                 return .run { send in
-                    #if canImport(ChatTabPersistent)
                     await send(.persistent(.chatOrderChanged))
-                    #endif
                 }.debounce(id: Debounce.updateChatTabOrder, for: 1, scheduler: DispatchQueue.main)
+                #else
+                return .none
+                #endif
             }
         }
     }
diff --git a/Pro b/Pro
@@ -1 +1 @@
-Subproject commit 02010b2d8142d5880fba84352b81d2ad355a5725
+Subproject commit 72fd9411fb566b45e8dbb2df418cb5ef7a99d5cd
diff --git a/TestPlan.xctestplan b/TestPlan.xctestplan
@@ -50,13 +50,6 @@
         "name" : "PromptToCodeServiceTests"
       }
     },
-    {
-      "target" : {
-        "containerPath" : "container:Core",
-        "identifier" : "GitHubCopilotServiceTests",
-        "name" : "GitHubCopilotServiceTests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:Tool",
@@ -99,13 +92,6 @@
         "name" : "SharedUIComponentsTests"
       }
     },
-    {
-      "target" : {
-        "containerPath" : "container:Core",
-        "identifier" : "ActiveDocumentChatContextCollectorTests",
-        "name" : "ActiveDocumentChatContextCollectorTests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:Tool",
@@ -126,6 +112,20 @@
         "identifier" : "KeychainTests",
         "name" : "KeychainTests"
       }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Tool",
+        "identifier" : "ActiveDocumentChatContextCollectorTests",
+        "name" : "ActiveDocumentChatContextCollectorTests"
+      }
+    },
+    {
+      "target" : {
+        "containerPath" : "container:Tool",
+        "identifier" : "GitHubCopilotServiceTests",
+        "name" : "GitHubCopilotServiceTests"
+      }
     }
   ],
   "version" : 1
diff --git a/Tool/Sources/OpenAIService/Configuration/UserPreferenceChatGPTConfiguration.swift b/Tool/Sources/OpenAIService/Configuration/UserPreferenceChatGPTConfiguration.swift
@@ -33,7 +33,7 @@ public struct UserPreferenceChatGPTConfiguration: ChatGPTConfiguration {
     }
 
     public var minimumReplyTokens: Int {
-        300
+        maxTokens / 5
     }
 
     public var runFunctionsAutomatically: Bool {
diff --git a/Version.xcconfig b/Version.xcconfig
@@ -1,3 +1,3 @@
-APP_VERSION = 0.24.1
-APP_BUILD = 251
+APP_VERSION = 0.25.0
+APP_BUILD = 261
  
diff --git a/appcast.xml b/appcast.xml
@@ -3,6 +3,18 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.25.0</title>
+      <pubDate>Wed, 11 Oct 2023 23:08:08 +0800</pubDate>
+      <sparkle:version>261</sparkle:version>
+      <sparkle:shortVersionString>0.25.0</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.25.0
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.25.0/Copilot.for.Xcode.app.zip" length="35224211" type="application/octet-stream" sparkle:edSignature="0Yug7VJ31/I4rZe8BO5OC8GvjzzeqZ8GiEnQal3m0dJJT9WudApOv/182hI3REw6beIYTryftu1dGTGWo0nICA=="/>
+    </item>
+
     <item>
       <title>0.24.1</title>
       <pubDate>Fri, 29 Sep 2023 14:35:35 +0800</pubDate>

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ struct GUI: ReducerProtocol {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Dependency(\.chatTabPool) var chatTabPool: ChatTabPool`
`68`		`-`
	`68`	`+`
`69`	`69`	`public enum Debounce: Hashable {`
`70`	`70`	`case updateChatTabOrder`
`71`	`71`	`}`
`@@ -224,11 +224,13 @@ struct GUI: ReducerProtocol {`
`224`	`224`	`guard old.map(\.id) != new.map(\.id) else {`
`225`	`225`	`return .none`
`226`	`226`	`}`
	`227`	`+ #if canImport(ChatTabPersistent)`
`227`	`228`	`return .run { send in`
`228`		`- #if canImport(ChatTabPersistent)`
`229`	`229`	`await send(.persistent(.chatOrderChanged))`
`230`		`- #endif`
`231`	`230`	`}.debounce(id: Debounce.updateChatTabOrder, for: 1, scheduler: DispatchQueue.main)`
	`231`	`+ #else`
	`232`	`+ return .none`
	`233`	`+ #endif`
`232`	`234`	`}`
`233`	`235`	`}`
`234`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public struct UserPreferenceChatGPTConfiguration: ChatGPTConfiguration {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public var minimumReplyTokens: Int {`
`36`		`- 300`
	`36`	`+ maxTokens / 5`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public var runFunctionsAutomatically: Bool {`