Return to use the official release of markdown-ui

Author: intitni

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

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

Core/Package.swift

@@ -0,0 +1,34 @@
+import AppKit
+import SwiftUI
+
+struct CopyButton: View {
+    var copy: () -> Void
+    @State var isCopied = false
+    var body: some View {
+        Button(action: {
+            withAnimation(.linear(duration: 0.1)) {
+                isCopied = true
+            }
+            copy()
+            Task {
+                try await Task.sleep(nanoseconds: 1_000_000_000)
+                withAnimation(.linear(duration: 0.1)) {
+                    isCopied = false
+                }
+            }
+        }) {
+            Image(systemName: isCopied ? "checkmark.circle" : "doc.on.doc")
+                .resizable()
+                .aspectRatio(contentMode: .fit)
+                .frame(width: 14, height: 14)
+                .frame(width: 20, height: 20, alignment: .center)
+                .foregroundColor(.secondary)
+                .background(
+                    .regularMaterial,
+                    in: RoundedRectangle(cornerRadius: 4, style: .circular)
+                )
+                .padding(4)
+        }
+        .buttonStyle(.borderless)
+    }
+}

Core/Sources/SuggestionWidget/CopyButton.swift

@@ -1,4 +1,5 @@
 import AppKit
+import MarkdownUI
 import SwiftUI
 
 enum Style {
@@ -53,3 +54,27 @@ extension View {
             )
     }
 }
+
+extension MarkdownUI.Theme {
+    static var custom: MarkdownUI.Theme {
+        .gitHub.text {
+            BackgroundColor(Color.clear)
+        }
+        .codeBlock { configuration in
+            configuration.label
+                .padding()
+                .padding(.trailing)
+                .background {
+                    RoundedRectangle(cornerRadius: 6, style: .continuous)
+                        .fill(Color(nsColor: .textBackgroundColor).opacity(0.7))
+                }
+                .overlay(alignment: .topTrailing) {
+                    CopyButton {
+                        NSPasteboard.general.clearContents()
+                        NSPasteboard.general.setString(configuration.content, forType: .string)
+                    }
+                }
+                .padding(.bottom)
+        }
+    }
+}

…dget/NSScrollView/CustomScrollView.swift …/CustomScrollView/CustomScrollView.swiftCore/Sources/SuggestionWidget/NSScrollView/CustomScrollView.swift renamed to Core/Sources/SuggestionWidget/CustomScrollView/CustomScrollView.swift Core/Sources/SuggestionWidget/NSScrollView/CustomScrollView.swift renamed to Core/Sources/SuggestionWidget/CustomScrollView/CustomScrollView.swift

@@ -80,7 +80,7 @@ struct ChatPanelMessages: View {
             VStack(spacing: 0) {
                 vstack {
                     Spacer()
-                    
+
                     if chat.isReceivingMessage {
                         StopRespondingButton(chat: chat)
                     }
@@ -103,7 +103,7 @@ struct ChatPanelMessages: View {
                             BotMessage(text: text)
                         }
                     }
-                    
+
                     Spacer()
                 }
             }
@@ -145,9 +145,7 @@ private struct UserMessage: View {
     var body: some View {
         Markdown(text)
             .textSelection(.enabled)
-            .markdownTheme(.gitHub.text {
-                BackgroundColor(Color.clear)
-            })
+            .markdownTheme(.custom)
             .markdownCodeSyntaxHighlighter(
                 ChatCodeSyntaxHighlighter(brightMode: colorScheme != .dark)
             )
@@ -186,12 +184,10 @@ private struct BotMessage: View {
                 NSPasteboard.general.setString(text, forType: .string)
             }
             .scaleEffect(x: -1, y: -1, anchor: .center)
-            
+
             Markdown(text)
                 .textSelection(.enabled)
-                .markdownTheme(.gitHub.text {
-                    BackgroundColor(Color.clear)
-                })
+                .markdownTheme(.custom)
                 .markdownCodeSyntaxHighlighter(
                     ChatCodeSyntaxHighlighter(brightMode: colorScheme != .dark)
                 )
@@ -392,38 +388,6 @@ struct GlobalChatSwitchToggleStyle: ToggleStyle {
     }
 }
 
-struct CopyButton: View {
-    var copy: () -> Void
-    @State var isCopied = false
-    var body: some View {
-        Button(action: {
-            withAnimation(.linear(duration: 0.1)) {
-                isCopied = true
-            }
-            copy()
-            Task {
-                try await Task.sleep(nanoseconds: 1_000_000_000)
-                withAnimation(.linear(duration: 0.1)) {
-                    isCopied = false
-                }
-            }
-        }) {
-            Image(systemName: isCopied ? "checkmark.circle" : "doc.on.doc")
-                .resizable()
-                .aspectRatio(contentMode: .fit)
-                .frame(width: 14, height: 14)
-                .frame(width: 20, height: 20, alignment: .center)
-                .foregroundColor(.secondary)
-                .background(
-                    .regularMaterial,
-                    in: RoundedRectangle(cornerRadius: 4, style: .circular)
-                )
-                .padding(4)
-        }
-        .buttonStyle(.borderless)
-    }
-}
-
 // MARK: - Previews
 
 struct ChatPanel_Preview: PreviewProvider {
@@ -436,7 +400,12 @@ struct ChatPanel_Preview: PreviewProvider {
         .init(
             id: "2",
             isUser: false,
-            text: "**Hey**! What can I do for you?**Hey**! What can I do for you?**Hey**! What can I do for you?**Hey**! What can I do for you?"
+            text: """
+            ```swift
+            func foo() {}
+            ```
+            **Hey**! What can I do for you?**Hey**! What can I do for you?**Hey**! What can I do for you?**Hey**! What can I do for you?
+            """
         ),
         .init(id: "5", isUser: false, text: "Yooo"),
         .init(id: "4", isUser: true, text: "Yeeeehh"),