Merge tag 'fix-tests' into develop

Author: intitni

Core/Package.swift

@@ -161,6 +161,7 @@ let package = Package(
                 .product(name: "SuggestionModel", package: "Tool"),
                 .product(name: "Environment", package: "Tool"),
                 .product(name: "OpenAIService", package: "Tool"),
+                .product(name: "AppMonitoring", package: "Tool"),
                 .product(name: "ComposableArchitecture", package: "swift-composable-architecture"),
             ]
         ),

Core/Sources/HostApp/FeatureSettings/ChatSettingsView.swift

@@ -50,8 +50,11 @@ struct ChatSettingsView: View {
                 if !settings.chatModels
                     .contains(where: { $0.id == settings.defaultChatFeatureChatModelId })
                 {
-                    Text(settings.chatModels.first?.name ?? "No Model Found")
-                        .tag(settings.defaultChatFeatureChatModelId)
+                    Text(
+                        (settings.chatModels.first?.name).map { "\($0) (Default)" }
+                            ?? "No Model Found"
+                    )
+                    .tag(settings.defaultChatFeatureChatModelId)
                 }
 
                 ForEach(settings.chatModels, id: \.id) { chatModel in
@@ -66,8 +69,11 @@ struct ChatSettingsView: View {
                 if !settings.embeddingModels
                     .contains(where: { $0.id == settings.defaultChatFeatureEmbeddingModelId })
                 {
-                    Text(settings.embeddingModels.first?.name ?? "No Model Found")
-                        .tag(settings.defaultChatFeatureEmbeddingModelId)
+                    Text(
+                        (settings.embeddingModels.first?.name).map { "\($0) (Default)" }
+                            ?? "No Model Found"
+                    )
+                    .tag(settings.defaultChatFeatureEmbeddingModelId)
                 }
 
                 ForEach(settings.embeddingModels, id: \.id) { embeddingModel in

Core/Sources/SuggestionInjector/SuggestionInjector.swift

@@ -239,7 +239,7 @@ public struct SuggestionInjector {
 
         // remove the first adjacent placeholder in suffix which looks like `<#Hello#>`
 
-        let regex = try! NSRegularExpression(pattern: "\\s+<#.*?#>")
+        let regex = try! NSRegularExpression(pattern: "\\s*?<#.*?#>")
 
         if let firstPlaceholderRange = regex.firstMatch(
             in: suffix,

Version.xcconfig

@@ -1,3 +1,3 @@
-APP_VERSION = 0.23.0
+APP_VERSION = 0.23.1
 APP_BUILD = 240
 

appcast.xml

@@ -4,15 +4,15 @@
     <title>Copilot for Xcode</title>
 
     <item>
-      <title>0.23.0</title>
-      <pubDate>Wed, 06 Sep 2023 17:58:47 +0800</pubDate>
+      <title>0.23.1</title>
+      <pubDate>Wed, 06 Sep 2023 21:08:26 +0800</pubDate>
       <sparkle:version>240</sparkle:version>
-      <sparkle:shortVersionString>0.23.0</sparkle:shortVersionString>
+      <sparkle:shortVersionString>0.23.1</sparkle:shortVersionString>
       <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
       <sparkle:releaseNotesLink>
-        https://github.com/intitni/CopilotForXcode/releases/tag/0.23.0
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.23.1
       </sparkle:releaseNotesLink>
-      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.23.0/Copilot.for.Xcode.app.zip" length="32300100" type="application/octet-stream" sparkle:edSignature="EydvmwTRuw3oNFY2hcsH1qbjFF4Kbn6fHIp+HMVa30if50ajmTYZiMM0nutx4EM/l7SCX2LDoy2aok9SjhoPBg=="/>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.23.1/Copilot.for.Xcode.app.zip" length="32300658" type="application/octet-stream" sparkle:edSignature="WrAqqWy1qQ7j662ix9+o2wQxnE1BnkNMS75V9AKLNeTec4rHuzfB5uVioRgHdr4DZZ66VVMsJJAL7AVG4is+DQ=="/>
     </item>
 
     <item>