Merge branch 'new-launch-method-followup' into develop

Author: intitni

Core/Sources/ChatGPTChatTab/ChatPanel.swift

@@ -277,42 +277,51 @@ struct ChatHistory: View {
     var body: some View {
         WithViewStore(chat, observe: \.history) { viewStore in
             ForEach(viewStore.state, id: \.id) { message in
-                let text = message.text
-
-                switch message.role {
-                case .user:
-                    UserMessage(id: message.id, text: text, chat: chat)
-                        .listRowInsets(EdgeInsets(
-                            top: 0,
-                            leading: -8,
-                            bottom: 0,
-                            trailing: -8
-                        ))
-                        .padding(.vertical, 4)
-                case .assistant:
-                    BotMessage(
-                        id: message.id,
-                        text: text,
-                        references: message.references,
-                        chat: chat
-                    )
-                    .listRowInsets(EdgeInsets(
-                        top: 0,
-                        leading: -8,
-                        bottom: 0,
-                        trailing: -8
-                    ))
-                    .padding(.vertical, 4)
-                case .tool:
-                    FunctionMessage(id: message.id, text: text)
-                case .ignored:
-                    EmptyView()
-                }
+                ChatHistoryItem(chat: chat, message: message).id(message.id)
             }
         }
     }
 }
 
+struct ChatHistoryItem: View {
+    let chat: StoreOf<Chat>
+    let message: DisplayedChatMessage
+
+    var body: some View {
+        let text = message.text
+
+        switch message.role {
+        case .user:
+            UserMessage(id: message.id, text: text, chat: chat)
+                .listRowInsets(EdgeInsets(
+                    top: 0,
+                    leading: -8,
+                    bottom: 0,
+                    trailing: -8
+                ))
+                .padding(.vertical, 4)
+        case .assistant:
+            BotMessage(
+                id: message.id,
+                text: text,
+                references: message.references,
+                chat: chat
+            )
+            .listRowInsets(EdgeInsets(
+                top: 0,
+                leading: -8,
+                bottom: 0,
+                trailing: -8
+            ))
+            .padding(.vertical, 4)
+        case .tool:
+            FunctionMessage(id: message.id, text: text)
+        case .ignored:
+            EmptyView()
+        }
+    }
+}
+
 private struct StopRespondingButton: View {
     let chat: StoreOf<Chat>
 
@@ -563,29 +572,6 @@ struct ChatPanel_EmptyChat_Preview: PreviewProvider {
     }
 }
 
-struct ChatCodeSyntaxHighlighter: CodeSyntaxHighlighter {
-    let brightMode: Bool
-    let font: NSFont
-    let colorChange: Color?
-
-    init(brightMode: Bool, font: NSFont, colorChange: Color?) {
-        self.brightMode = brightMode
-        self.font = font
-        self.colorChange = colorChange
-    }
-
-    func highlightCode(_ content: String, language: String?) -> Text {
-        let content = highlightedCodeBlock(
-            code: content,
-            language: language ?? "",
-            scenario: "chat",
-            brightMode: brightMode,
-            font: font
-        )
-        return Text(AttributedString(content))
-    }
-}
-
 struct ChatPanel_InputText_Preview: PreviewProvider {
     static var previews: some View {
         ChatPanel(chat: .init(

Core/Sources/ChatGPTChatTab/CodeBlockHighlighter.swift

@@ -0,0 +1,104 @@
+import Combine
+import DebounceFunction
+import Foundation
+import MarkdownUI
+import SharedUIComponents
+import SwiftUI
+
+/// Use this instead of the built in ``CodeBlockView`` to highlight code blocks asynchronously,
+/// so that the UI doesn't freeze when rendering large code blocks.
+struct AsyncCodeBlockView: View {
+    class Storage: ObservableObject {
+        static let queue = DispatchQueue(
+            label: "chat-code-block-highlight",
+            qos: .userInteractive
+        )
+
+        @Published var highlighted: AttributedString?
+        var debounceFunction: DebounceFunction<AsyncCodeBlockView>?
+        
+        init() {
+            self.debounceFunction = .init(duration: 0.5, block: { [weak self] view in
+                self?.highlight(for: view)
+            })
+        }
+
+        func highlight(debounce: Bool, for view: AsyncCodeBlockView) {
+            if debounce {
+                Task { await debounceFunction?(view) }
+            } else {
+                highlight(for: view)
+            }
+        }
+        
+        func highlight(for view: AsyncCodeBlockView) {
+            let content = view.content
+            let language = view.fenceInfo ?? ""
+            let brightMode = view.colorScheme != .dark
+            let font = view.font
+            Self.queue.async {
+                let content = highlightedCodeBlock(
+                    code: content,
+                    language: language,
+                    scenario: "chat",
+                    brightMode: brightMode,
+                    font: font
+                )
+                let string = AttributedString(content)
+                DispatchQueue.main.async {
+                    self.highlighted = string
+                }
+            }
+        }
+    }
+
+    let fenceInfo: String?
+    let content: String
+    let font: NSFont
+
+    @Environment(\.colorScheme) var colorScheme
+    @StateObject var storage = Storage()
+    @AppStorage(\.syncChatCodeHighlightTheme) var syncCodeHighlightTheme
+    @AppStorage(\.codeForegroundColorLight) var codeForegroundColorLight
+    @AppStorage(\.codeBackgroundColorLight) var codeBackgroundColorLight
+    @AppStorage(\.codeForegroundColorDark) var codeForegroundColorDark
+    @AppStorage(\.codeBackgroundColorDark) var codeBackgroundColorDark
+
+    init(fenceInfo: String?, content: String, font: NSFont) {
+        self.fenceInfo = fenceInfo
+        self.content = content.hasSuffix("\n") ? String(content.dropLast()) : content
+        self.font = font
+    }
+
+    var body: some View {
+        Group {
+            if let highlighted = storage.highlighted {
+                Text(highlighted)
+            } else {
+                Text(content).font(.init(font))
+            }
+        }
+        .onAppear {
+            storage.highlight(debounce: false, for: self)
+        }
+        .onChange(of: colorScheme) { _ in
+            storage.highlight(debounce: false, for: self)
+        }
+        .onChange(of: syncCodeHighlightTheme) { _ in
+            storage.highlight(debounce: true, for: self)
+        }
+        .onChange(of: codeForegroundColorLight) { _ in
+            storage.highlight(debounce: true, for: self)
+        }
+        .onChange(of: codeBackgroundColorLight) { _ in
+            storage.highlight(debounce: true, for: self)
+        }
+        .onChange(of: codeForegroundColorDark) { _ in
+            storage.highlight(debounce: true, for: self)
+        }
+        .onChange(of: codeBackgroundColorDark) { _ in
+            storage.highlight(debounce: true, for: self)
+        }
+    }
+}
+