Support disabling code wrapping in prompt to code

Author: intitni

Core/Sources/HostApp/FeatureSettings/PromptToCodeSettingsView.swift

@@ -20,7 +20,7 @@ struct PromptToCodeSettingsView: View {
         var promptToCodeChatModelId
         @AppStorage(\.promptToCodeEmbeddingModelId)
         var promptToCodeEmbeddingModelId
-
+        @AppStorage(\.wrapCodeInPromptToCode) var wrapCode
         @AppStorage(\.chatModels) var chatModels
         @AppStorage(\.embeddingModels) var embeddingModels
         init() {}
@@ -90,6 +90,10 @@ struct PromptToCodeSettingsView: View {
                 Toggle(isOn: $settings.hideCommonPrecedingSpaces) {
                     Text("Hide Common Preceding Spaces")
                 }
+                
+                Toggle(isOn: $settings.wrapCode) {
+                    Text("Wrap code")
+                }
 
                 #if canImport(ProHostApp)
 

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -209,6 +209,7 @@ extension PromptToCodePanel {
         @AppStorage(\.codeForegroundColorDark) var codeForegroundColorDark
         @AppStorage(\.codeBackgroundColorLight) var codeBackgroundColorLight
         @AppStorage(\.codeBackgroundColorDark) var codeBackgroundColorDark
+        @AppStorage(\.wrapCodeInPromptToCode) var wrapCode
 
         struct CodeContent: Equatable {
             var code: String
@@ -241,11 +242,11 @@ extension PromptToCodePanel {
                     return color
                 }
             }
-            return Color.clear
+            return Color.contentBackground
         }
 
         var body: some View {
-            CustomScrollView {
+            ScrollView {
                 VStack(spacing: 0) {
                     Spacer(minLength: 60)
 
@@ -304,25 +305,41 @@ extension PromptToCodePanel {
                             .frame(maxWidth: .infinity)
                             .scaleEffect(x: 1, y: -1, anchor: .center)
                         } else {
-                            CodeBlock(
-                                code: viewStore.state.code,
-                                language: viewStore.state.language,
-                                startLineIndex: viewStore.state.startLineIndex, 
-                                scenario: "promptToCode",
-                                colorScheme: colorScheme,
-                                firstLinePrecedingSpaceCount: viewStore.state
-                                    .firstLinePrecedingSpaceCount,
-                                font: codeFont.value.nsFont,
-                                droppingLeadingSpaces: hideCommonPrecedingSpaces,
-                                proposedForegroundColor:codeForegroundColor
-                            )
-                            .frame(maxWidth: .infinity)
-                            .scaleEffect(x: 1, y: -1, anchor: .center)
+                            if wrapCode {
+                                codeBlock(viewStore.state)
+                            } else {
+                                ScrollView(.horizontal) {
+                                    codeBlock(viewStore.state)
+                                }
+                                .modify {
+                                    if #available(macOS 13.0, *) {
+                                        $0.scrollIndicators(.hidden)
+                                    } else {
+                                        $0
+                                    }
+                                }
+                            }
                         }
                     }
                 }
-                .background(codeBackgroundColor)
             }
+            .background(codeBackgroundColor)
+            .scaleEffect(x: 1, y: -1, anchor: .center)
+        }
+        
+        func codeBlock(_ state: CodeContent) -> some View {
+            CodeBlock(
+                code: state.code,
+                language: state.language,
+                startLineIndex: state.startLineIndex,
+                scenario: "promptToCode",
+                colorScheme: colorScheme,
+                firstLinePrecedingSpaceCount: state.firstLinePrecedingSpaceCount,
+                font: codeFont.value.nsFont,
+                droppingLeadingSpaces: hideCommonPrecedingSpaces,
+                proposedForegroundColor:codeForegroundColor
+            )
+            .frame(maxWidth: .infinity)
             .scaleEffect(x: 1, y: -1, anchor: .center)
         }
     }

Tool/Sources/Preferences/Keys.swift

@@ -302,6 +302,10 @@ public extension UserDefaultPreferenceKeys {
     var hideCommonPrecedingSpacesInPromptToCode: PreferenceKey<Bool> {
         .init(defaultValue: true, key: "HideCommonPrecedingSpacesInPromptToCode")
     }
+    
+    var wrapCodeInPromptToCode: PreferenceKey<Bool> {
+        .init(defaultValue: false, key: "WrapCodeInPromptToCode")
+    }
 }
 
 // MARK: - Suggestion

Tool/Sources/SharedUIComponents/CodeBlock.swift

@@ -13,6 +13,7 @@ public struct CodeBlock: View {
     public let font: NSFont
     public let droppingLeadingSpaces: Bool
     public let proposedForegroundColor: Color?
+    public let wrapCode: Bool
 
     public init(
         code: String,
@@ -23,7 +24,8 @@ public struct CodeBlock: View {
         firstLinePrecedingSpaceCount: Int = 0,
         font: NSFont,
         droppingLeadingSpaces: Bool,
-        proposedForegroundColor: Color?
+        proposedForegroundColor: Color?,
+        wrapCode: Bool = true
     ) {
         self.code = code
         self.language = language
@@ -34,6 +36,7 @@ public struct CodeBlock: View {
         self.firstLinePrecedingSpaceCount = firstLinePrecedingSpaceCount
         self.font = font
         self.proposedForegroundColor = proposedForegroundColor
+        self.wrapCode = wrapCode
         let padding = firstLinePrecedingSpaceCount > 0
             ? String(repeating: " ", count: firstLinePrecedingSpaceCount)
             : ""