Merge tag '0.13.0' into develop

Author: intitni

Core/Sources/OpenAIService/ChatGPTService.swift

@@ -125,7 +125,7 @@ public actor ChatGPTService: ChatGPTServiceType {
             messages: messages,
             temperature: temperature ?? defaultTemperature,
             stream: true,
-            max_tokens: remainingTokens
+            max_tokens: maxTokenForReply(model: model, remainingTokens: remainingTokens)
         )
 
         isReceivingMessage = true
@@ -205,7 +205,7 @@ public actor ChatGPTService: ChatGPTServiceType {
             messages: messages,
             temperature: temperature ?? defaultTemperature,
             stream: true,
-            max_tokens: remainingTokens
+            max_tokens: maxTokenForReply(model: model, remainingTokens: remainingTokens)
         )
 
         isReceivingMessage = true
@@ -261,7 +261,7 @@ extension ChatGPTService {
     }
 
     func combineHistoryWithSystemPrompt(
-        minimumReplyTokens: Int = 200,
+        minimumReplyTokens: Int = 300,
         maxNumberOfMessages: Int = UserDefaults.shared.value(for: \.chatGPTMaxMessageCount),
         maxTokens: Int = UserDefaults.shared.value(for: \.chatGPTMaxToken),
         encoder: TokenEncoder = GPTEncoder()
@@ -270,10 +270,11 @@ extension ChatGPTService {
     {
         var all: [CompletionRequestBody.Message] = []
         var allTokensCount = encoder.encode(text: systemPrompt).count
-        for message in history.reversed() {
+        for (index, message) in history.enumerated().reversed() {
             if maxNumberOfMessages > 0, all.count >= maxNumberOfMessages { break }
             if message.content.isEmpty { continue }
-            let tokensCount = encoder.encode(text: message.content).count
+            let tokensCount = message.tokensCount ?? encoder.encode(text: message.content).count
+            history[index].tokensCount = tokensCount
             if tokensCount + allTokensCount > maxTokens - minimumReplyTokens {
                 break
             }
@@ -291,3 +292,8 @@ protocol TokenEncoder {
 }
 
 extension GPTEncoder: TokenEncoder {}
+
+func maxTokenForReply(model: String, remainingTokens: Int) -> Int {
+    guard let model = ChatGPTModel(rawValue: model) else { return remainingTokens }
+    return min(model.maxToken / 2, remainingTokens)
+}

Core/Sources/OpenAIService/Models.swift

@@ -15,9 +15,14 @@ public struct ChatMessage: Equatable, Codable {
     }
 
     public var role: Role
-    public var content: String
+    public var content: String {
+        didSet {
+            tokensCount = nil
+        }
+    }
     public var summary: String?
     public var id: String
+    public var tokensCount: Int?
 
     public init(
         id: String = UUID().uuidString,

Core/Sources/SuggestionWidget/CustomScrollView/CustomScrollView.swift

@@ -1,27 +1,46 @@
 import AppKit
-import SwiftUI
 import Combine
+import SwiftUI
+
+struct CustomScrollViewHeightPreferenceKey: PreferenceKey {
+    static var defaultValue: Double = 0
+    static func reduce(value: inout Double, nextValue: () -> Double) {
+        value = nextValue() + value
+    }
+}
+
+struct CustomScrollViewUpdateHeightModifier: ViewModifier {
+    func body(content: Content) -> some View {
+        content
+            .background {
+                GeometryReader { proxy in
+                    Color.clear
+                        .preference(
+                            key: CustomScrollViewHeightPreferenceKey.self,
+                            value: proxy.size.height
+                        )
+                }
+            }
+    }
+}
 
 /// Used to workaround a SwiftUI bug. https://github.com/intitni/CopilotForXcode/issues/122
 struct CustomScrollView<Content: View>: View {
     @ViewBuilder var content: () -> Content
-    @State var height: Double = 100
+    @State var height: Double = 10
     @AppStorage(\.useCustomScrollViewWorkaround) var useNSScrollViewWrapper
 
     var body: some View {
         if useNSScrollViewWrapper {
             List {
                 content()
                     .listRowInsets(EdgeInsets(top: 0, leading: -8, bottom: 0, trailing: -8))
+                    .modifier(CustomScrollViewUpdateHeightModifier())
             }
             .listStyle(.plain)
-            .frame(idealHeight: height)
-            .background {
-                ComputeHeight(height: $height) {
-                    content()
-                }
-                .frame(maxWidth: .infinity)
-                .opacity(0)
+            .frame(idealHeight: max(10, height))
+            .onPreferenceChange(CustomScrollViewHeightPreferenceKey.self) { newHeight in
+                height = newHeight
             }
         } else {
             ScrollView {
@@ -30,31 +49,3 @@ struct CustomScrollView<Content: View>: View {
         }
     }
 }
-
-private struct ComputeHeight<Content: View>: NSViewRepresentable {
-    @Binding var height: Double
-    @ViewBuilder var content: () -> Content
-
-    func makeNSView(context: Context) -> NSView {
-        let view = NSView()
-        return view
-    }
-
-    func updateNSView(_ nsView: NSView, context: Context) {
-        updateHeight(nsView)
-    }
-    
-    func updateHeight(_ nsView: NSView) {
-        let contentView = content()
-        let hostingView = NSHostingView(
-            rootView: contentView.frame(width: nsView.frame.width == 0 ? 200 : nsView.frame.width)
-        )
-        let size = hostingView.fittingSize
-
-        if height != size.height {
-            Task { @MainActor in
-                height = size.height
-            }
-        }
-    }
-}

Core/Sources/SuggestionWidget/SyntaxHighlighting.swift

@@ -61,7 +61,7 @@ func highlightedCodeBlock(
             }
             return leadingSpaces
         }
-        
+
         // Workaround: Splash has a bug that will insert an extra space at the beginning.
         let leadingSpaces = leadingSpacesInCode(code)
         let leadingSpacesFormatted = leadingSpacesInCode(formatted.string)
@@ -73,7 +73,7 @@ func highlightedCodeBlock(
             )
         }
         // End of workaround.
-        
+
         return formatted
     default:
         var language = language
@@ -148,15 +148,16 @@ func convertToCodeLines(
     let separatedInput = input.components(separatedBy: "\n")
     let commonLeadingSpaceCount = {
         if !droppingLeadingSpaces { return 0 }
-        let splitted = separatedInput
+        let split = separatedInput
         var result = 0
-        outerLoop: for i in [4, 8, 12, 16, 20, 24] {
-            for line in splitted {
+        outerLoop: for i in stride(from: 40, through: 4, by: -4) {
+            for line in split {
                 if isEmptyLine(line) { continue }
-                if i >= line.count { break outerLoop }
-                if !line.hasPrefix(.init(repeating: " ", count: i)) { break outerLoop }
+                if i >= line.count { continue outerLoop }
+                if !line.hasPrefix(.init(repeating: " ", count: i)) { continue outerLoop }
             }
             result = i
+            break
         }
         return result
     }()

Core/Tests/OpenAIServiceTests/ChatGPTServiceTests.swift

@@ -62,7 +62,10 @@ final class ChatGPTServiceTests: XCTestCase {
             .init(role: .user, content: "Hello"),
         ], "System prompt is included")
         XCTAssertEqual(all, ["hello", "my", "friends"], "Text stream is correct")
-        let history = await service.history
+        var history = await service.history
+        for (i, _) in history.enumerated() {
+            history[i].tokensCount = nil
+        }
         XCTAssertEqual(history, [
             .init(id: "0", role: .user, content: "Hello"),
             .init(id: "1", role: .assistant, content: "hellomyfriends"),

Core/Tests/OpenAIServiceTests/LimitMessagesTests.swift

@@ -23,10 +23,16 @@ final class LimitMessagesTests: XCTestCase {
             "hello",
             "world",
         ])
-        
+
         XCTAssertEqual(remainingTokens, 10000 - 12 - 6)
+        let history = await service.history
+        XCTAssertEqual(history.map(\.tokensCount), [
+            2,
+            5,
+            5,
+        ])
     }
-    
+
     func test_send_max_message_if_not_reached_token_limit() async {
         let service = await createService(systemPrompt: "system", messages: [
             "hi",
@@ -45,10 +51,10 @@ final class LimitMessagesTests: XCTestCase {
             "hello",
             "world",
         ], "Count from end to start.")
-        
+
         XCTAssertEqual(remainingTokens, 10000 - 10 - 6)
     }
-    
+
     func test_reached_token_limit() async {
         let service = await createService(systemPrompt: "system", messages: [
             "hi",
@@ -66,10 +72,10 @@ final class LimitMessagesTests: XCTestCase {
             "system",
             "world",
         ])
-        
+
         XCTAssertEqual(remainingTokens, 201)
     }
-    
+
     func test_minimum_reply_tokens_count() async {
         let service = await createService(systemPrompt: "system", messages: [
             "hi",
@@ -86,7 +92,7 @@ final class LimitMessagesTests: XCTestCase {
         XCTAssertEqual(messages, [
             "system",
         ])
-        
+
         XCTAssertEqual(remainingTokens, 200)
     }
 }

README.md

@@ -163,6 +163,10 @@ If you need to end a plugin, you can just type
 
 Prompt to code commands are not available in comment mode.
 
+### Custom Commands
+
+You can create custom commands that runs Chat and Prompt to Code with custom prompts. This commands can be accessed from the Xcode menu bar and the context menu of the circular widget.
+
 ## Key Bindings
 
 It looks like there is no way to add default key bindings to commands, but you can set them up in `Xcode settings > Key Bindings`. You can filter the list by typing `copilot` in the search bar.

Version.xcconfig

@@ -1,2 +1,2 @@
-APP_VERSION = 0.12.0
-APP_BUILD = 90
+APP_VERSION = 0.13.0
+APP_BUILD = 101

appcast.xml

@@ -3,14 +3,26 @@
   <channel>
     <title>Copilot for Xcode</title>
 
+    <item>
+      <title>0.13.0</title>
+      <pubDate>Sat, 22 Apr 2023 12:20:16 +0800</pubDate>
+      <sparkle:version>101</sparkle:version>
+      <sparkle:shortVersionString>0.13.0</sparkle:shortVersionString>
+      <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
+      <sparkle:releaseNotesLink>
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.13.0
+      </sparkle:releaseNotesLink>
+      <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.13.0/Copilot.for.Xcode.app.zip" length="20082799" type="application/octet-stream" sparkle:edSignature="5fI7XeXX4gBk/eXZh/rfpKbF67FXChUuusrQR5Z+ly0GhMSpTM9wf9MiWTyFeCSYdbp+GQftYHGQGDfT8TlMBQ=="/>
+    </item>
+
     <item>
       <title>0.12.0</title>
       <pubDate>Sat, 15 Apr 2023 14:43:37 +0800</pubDate>
       <sparkle:version>90</sparkle:version>
       <sparkle:shortVersionString>0.12.0</sparkle:shortVersionString>
       <sparkle:minimumSystemVersion>12.0</sparkle:minimumSystemVersion>
       <sparkle:releaseNotesLink>
-        https://github.com/intitni/CopilotForXcode/releases/tag/0.11.2
+        https://github.com/intitni/CopilotForXcode/releases/tag/0.12.0
       </sparkle:releaseNotesLink>
       <enclosure url="https://github.com/intitni/CopilotForXcode/releases/download/0.12.0/Copilot.for.Xcode.app.zip" length="19259862" type="application/octet-stream" sparkle:edSignature="E1arc0aqs+QEc2O9d/KEOEchBwmxPTamoTaQhl8qng9Z3Kqmvwg8Sc9VTyJ2xgbhY/DaAcJYapz8lR5g8BbZBA=="/>
     </item>