Support syntax highlighting and copy code in chat panel

Author: intitni

Copilot for Xcode.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -37,8 +37,8 @@ let package = Package(
         .package(url: "https://github.com/raspu/Highlightr", from: "2.1.0"),
         .package(url: "https://github.com/JohnSundell/Splash", from: "0.1.0"),
         .package(url: "https://github.com/nmdias/FeedKit", from: "9.1.2"),
-        .package(url: "https://github.com/gonzalezreal/swift-markdown-ui", from: "2.0.0"),
-        .package(url: "https://github.com/sparkle-project/Sparkle", from: "2.0.0"),
+        .package(url: "https://github.com/intitni/swift-markdown-ui", branch: "main"),
+        .package(url: "https://github.com/sparkle-project/Sparkle", from: "2.0.0"), 
     ],
     targets: [
         .target(name: "CGEventObserver"),

Core/Package.swift

@@ -2,16 +2,20 @@ import MarkdownUI
 import SwiftUI
 
 struct ChatPanel: View {
-    var viewModel: SuggestionPanelViewModel
+    @ObservedObject var viewModel: SuggestionPanelViewModel
     @ObservedObject var chat: ChatRoom
     @Namespace var inputAreaNamespace
     @State var typedMessage = ""
 
     var body: some View {
         ZStack(alignment: .topTrailing) {
             VStack {
-                ChatPanelMessages(chat: chat, inputAreaNamespace: inputAreaNamespace)
-                    .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
+                ChatPanelMessages(
+                    chat: chat,
+                    inputAreaNamespace: inputAreaNamespace,
+                    colorScheme: viewModel.colorScheme
+                )
+                .clipShape(RoundedRectangle(cornerRadius: 8, style: .continuous))
 
                 if !chat.isReceivingMessage {
                     ChatPanelInputArea(
@@ -41,6 +45,7 @@ struct ChatPanel: View {
 struct ChatPanelMessages: View {
     @ObservedObject var chat: ChatRoom
     var inputAreaNamespace: Namespace.ID
+    var colorScheme: ColorScheme
     @AppStorage(\.disableLazyVStack) var disableLazyVStack
 
     @ViewBuilder
@@ -101,6 +106,9 @@ struct ChatPanelMessages: View {
                         .markdownTheme(.gitHub.text {
                             BackgroundColor(Color.clear)
                         })
+                        .markdownCodeSyntaxHighlighter(
+                            ChatCodeSyntaxHighlighter(brightMode: colorScheme != .dark)
+                        )
                         .frame(maxWidth: .infinity, alignment: .leading)
                         .padding()
                         .background(
@@ -219,6 +227,9 @@ struct ChatPanel_Preview: PreviewProvider {
             ```swift
             func foo() {}
             ```
+            ```objectivec
+            - (void)bar {}
+            ```
             """#
         ),
     ]
@@ -237,6 +248,23 @@ struct ChatPanel_Preview: PreviewProvider {
     }
 }
 
+struct ChatCodeSyntaxHighlighter: CodeSyntaxHighlighter {
+    let brightMode: Bool
+
+    init(brightMode: Bool) {
+        self.brightMode = brightMode
+    }
+
+    func highlightCode(_ content: String, language: String?) -> Text {
+        let content = highlightedCodeBlock(
+            code: content,
+            language: language ?? "",
+            brightMode: brightMode
+        )
+        return Text(AttributedString(content))
+    }
+}
+
 struct ChatPanel_InputText_Preview: PreviewProvider {
     static var previews: some View {
         ChatPanel(viewModel: .init(

Core/Sources/SuggestionWidget/SuggestionPanelContent/ChatPanel.swift

@@ -3,11 +3,9 @@ import Foundation
 import Highlightr
 import Splash
 import XPCShared
+import SwiftUI
 
-func highlighted(code: String, language: String, brightMode: Bool) -> [NSAttributedString] {
-    let middleDotColor = brightMode
-        ? NSColor.black.withAlphaComponent(0.1)
-        : NSColor.white.withAlphaComponent(0.1)
+func highlightedCodeBlock(code: String, language: String, brightMode: Bool) -> NSAttributedString {
     switch language {
     case "swift":
         let plainTextColor = brightMode
@@ -47,17 +45,17 @@ func highlighted(code: String, language: String, brightMode: Bool) -> [NSAttribu
             [.font: NSFont.monospacedSystemFont(ofSize: 13, weight: .regular)],
             range: NSRange(location: 0, length: formatted.length)
         )
-        return convertToCodeLines(formatted, middleDotColor: middleDotColor)
+        return formatted
     default:
         var language = language
         if language == "objective-c" {
             language = "objectivec"
         }
-        func unhighlightedCode() -> [NSAttributedString] {
-            return convertToCodeLines(NSAttributedString(
+        func unhighlightedCode() -> NSAttributedString {
+            return NSAttributedString(
                 string: code,
                 attributes: [.foregroundColor: NSColor.white]
-            ), middleDotColor: middleDotColor)
+            )
         }
         guard let highlighter = Highlightr() else {
             return unhighlightedCode()
@@ -70,10 +68,18 @@ func highlighted(code: String, language: String, brightMode: Bool) -> [NSAttribu
         if formatted.string == "undefined" {
             return unhighlightedCode()
         }
-        return convertToCodeLines(formatted, middleDotColor: middleDotColor)
+        return formatted
     }
 }
 
+func highlighted(code: String, language: String, brightMode: Bool) -> [NSAttributedString] {
+    let formatted = highlightedCodeBlock(code: code, language: language, brightMode: brightMode)
+    let middleDotColor = brightMode
+        ? NSColor.black.withAlphaComponent(0.1)
+        : NSColor.white.withAlphaComponent(0.1)
+    return convertToCodeLines(formatted, middleDotColor: middleDotColor)
+}
+
 private func convertToCodeLines(
     _ formattedCode: NSAttributedString,
     middleDotColor: NSColor