Allow unwrapping code in code block

Author: intitni

Core/Sources/ChatGPTChatTab/Styles.swift

@@ -33,25 +33,20 @@ extension NSAppearance {
     }
 }
 
-extension MarkdownUI.Theme {
-    static func custom(fontSize: Double) -> MarkdownUI.Theme {
-        .gitHub.text {
-            ForegroundColor(.primary)
-            BackgroundColor(Color.clear)
-            FontSize(fontSize)
-        }
-        .codeBlock { configuration in
-            ScrollView(.horizontal) {
-                configuration.label
-                    .relativeLineSpacing(.em(0.225))
-                    .markdownTextStyle {
-                        FontFamilyVariant(.monospaced)
-                        FontSize(.em(0.85))
-                    }
-                    .padding(16)
-                    .padding(.top, 14)
+extension View {
+    func codeBlockLabelStyle() -> some View {
+        self
+            .relativeLineSpacing(.em(0.225))
+            .markdownTextStyle {
+                FontFamilyVariant(.monospaced)
+                FontSize(.em(0.85))
             }
-            .workaroundForVerticalScrollingBugInMacOS()
+            .padding(16)
+            .padding(.top, 14)
+    }
+    
+    func codeBlockStyle(_ configuration: CodeBlockConfiguration) -> some View {
+        self
             .background(Color(nsColor: .textBackgroundColor).opacity(0.7))
             .clipShape(RoundedRectangle(cornerRadius: 6))
             .overlay(alignment: .top) {
@@ -69,6 +64,31 @@ extension MarkdownUI.Theme {
                 }
             }
             .markdownMargin(top: 4, bottom: 16)
+    }
+}
+
+extension MarkdownUI.Theme {
+    static func custom(fontSize: Double) -> MarkdownUI.Theme {
+        .gitHub.text {
+            ForegroundColor(.primary)
+            BackgroundColor(Color.clear)
+            FontSize(fontSize)
+        }
+        .codeBlock { configuration in
+            let wrapCode = UserDefaults.shared.value(for: \.wrapCodeInChatCodeBlock)
+
+            if wrapCode {
+                configuration.label
+                    .codeBlockLabelStyle()
+                    .codeBlockStyle(configuration)
+            } else {
+                ScrollView(.horizontal) {
+                    configuration.label
+                        .codeBlockLabelStyle()
+                }
+                .workaroundForVerticalScrollingBugInMacOS()
+                .codeBlockStyle(configuration)
+            }
         }
     }
 

Core/Sources/HostApp/FeatureSettings/ChatSettingsView.swift

@@ -19,6 +19,7 @@ struct ChatSettingsView: View {
         @AppStorage(\.defaultChatFeatureEmbeddingModelId) var defaultChatFeatureEmbeddingModelId
         @AppStorage(\.chatModels) var chatModels
         @AppStorage(\.embeddingModels) var embeddingModels
+        @AppStorage(\.wrapCodeInChatCodeBlock) var wrapCodeInCodeBlock
 
         init() {}
     }
@@ -159,6 +160,10 @@ struct ChatSettingsView: View {
 
                 Text("pt")
             }
+            
+            Toggle(isOn: $settings.wrapCodeInCodeBlock) {
+                Text("Wrap code in code block")
+            }
         }
     }
 

Tool/Sources/Preferences/Keys.swift

@@ -384,6 +384,10 @@ public extension UserDefaultPreferenceKeys {
     var chatSearchPluginMaxIterations: PreferenceKey<Int> {
         .init(defaultValue: 3, key: "ChatSearchPluginMaxIterations")
     }
+    
+    var wrapCodeInChatCodeBlock: PreferenceKey<Bool> {
+        .init(defaultValue: true, key: "WrapCodeInChatCodeBlock")
+    }
 }
 
 // MARK: - Bing Search