Merge branch 'feature/custom-scroll-view' into develop

Author: intitni

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

@@ -9,6 +9,7 @@ final class DebugSettings: ObservableObject {
     var preCacheOnFileOpen: Bool
     @AppStorage(\.runNodeWithInteractiveLoggedInShell)
     var runNodeWithInteractiveLoggedInShell: Bool
+    @AppStorage(\.useCustomScrollViewWorkaround) var useCustomScrollViewWorkaround
     init() {}
 }
 
@@ -30,6 +31,10 @@ struct DebugSettingsView: View {
                     Text("Run node with interactive logged-in bash")
                 }
                 .toggleStyle(.switch)
+                Toggle(isOn: $settings.useCustomScrollViewWorkaround) {
+                    Text("Use custom scroll view workaround for smooth scrolling")
+                }
+                .toggleStyle(.switch)
             }
         }.buttonStyle(.copilot)
     }

Copilot for Xcode/DebugView.swift

@@ -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

@@ -174,6 +174,7 @@ public struct UserDefaultPreferenceKeys {
     public var preCacheOnFileOpen: FeatureFlags.PreCacheOnFileOpen { .init() }
     public var runNodeWithInteractiveLoggedInShell: FeatureFlags
         .RunNodeWithInteractiveLoggedInShell { .init() }
+    public var useCustomScrollViewWorkaround: FeatureFlags.UseCustomScrollViewWorkaround { .init() }
 }
 
 public enum FeatureFlags {
@@ -191,4 +192,9 @@ public enum FeatureFlags {
         public let defaultValue = true
         public let key = "FeatureFlag-RunNodeWithInteractiveLoggedInShell"
     }
+    
+    public struct UseCustomScrollViewWorkaround: UserDefaultPreferenceKey {
+        public let defaultValue = true
+        public let key = "FeatureFlag-UseCustomScrollViewWorkaround"
+    }
 }

Core/Sources/Preferences/Keys.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

@@ -0,0 +1,60 @@
+import AppKit
+import SwiftUI
+import Combine
+
+/// 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
+    @AppStorage(\.useCustomScrollViewWorkaround) var useNSScrollViewWrapper
+
+    var body: some View {
+        if useNSScrollViewWrapper {
+            List {
+                content()
+                    .listRowInsets(EdgeInsets(top: 0, leading: -8, bottom: 0, trailing: -8))
+            }
+            .listStyle(.plain)
+            .frame(idealHeight: height)
+            .background {
+                ComputeHeight(height: $height) {
+                    content()
+                }
+                .frame(maxWidth: .infinity)
+                .opacity(0)
+            }
+        } else {
+            ScrollView {
+                content()
+            }
+        }
+    }
+}
+
+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/CustomScrollView/CustomScrollView.swift

@@ -1,4 +1,5 @@
 import AppKit
+import MarkdownUI
 import SwiftUI
 
 enum Style {
@@ -53,3 +54,29 @@ extension View {
             )
     }
 }
+
+extension MarkdownUI.Theme {
+    static var custom: MarkdownUI.Theme {
+        .gitHub.text {
+            BackgroundColor(Color.clear)
+        }
+        .codeBlock { configuration in
+            configuration.label
+                .relativeLineSpacing(.em(0.225))
+                .markdownTextStyle {
+                    FontFamilyVariant(.monospaced)
+                    FontSize(.em(0.85))
+                }
+                .padding(16)
+                .background(Color(nsColor: .textBackgroundColor).opacity(0.7))
+                .clipShape(RoundedRectangle(cornerRadius: 6))
+                .overlay(alignment: .topTrailing) {
+                    CopyButton {
+                        NSPasteboard.general.clearContents()
+                        NSPasteboard.general.setString(configuration.content, forType: .string)
+                    }
+                }
+                .markdownMargin(top: 0, bottom: 16)
+        }
+    }
+}