Correctly format code if the selection range doesn't start at character 0

Author: intitni

Core/Sources/Service/GUI/PromptToCodeProvider+Service.swift

@@ -8,7 +8,8 @@ extension PromptToCodeProvider {
             code: service.code,
             language: service.language.rawValue,
             description: "",
-            startLineIndex: service.selectionRange.start.line
+            startLineIndex: service.selectionRange.start.line,
+            startLineColumn: service.selectionRange.start.character
         )
 
         var cancellables = Set<AnyCancellable>()

Core/Sources/SuggestionWidget/PromptToCodeProvider.swift

@@ -9,6 +9,7 @@ public final class PromptToCodeProvider: ObservableObject {
     @Published public var description: String
     @Published public var isResponding: Bool
     @Published public var startLineIndex: Int
+    @Published public var startLineColumn: Int
     @Published public var requirement: String
     @Published public var errorMessage: String
     @Published public var canRevert: Bool
@@ -25,6 +26,7 @@ public final class PromptToCodeProvider: ObservableObject {
         description: String = "",
         isResponding: Bool = false,
         startLineIndex: Int = 0,
+        startLineColumn: Int = 0,
         requirement: String = "",
         errorMessage: String = "",
         canRevert: Bool = false,
@@ -39,6 +41,7 @@ public final class PromptToCodeProvider: ObservableObject {
         self.description = description
         self.isResponding = isResponding
         self.startLineIndex = startLineIndex
+        self.startLineColumn = startLineColumn
         self.requirement = requirement
         self.errorMessage = errorMessage
         self.canRevert = canRevert

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlock.swift

@@ -7,19 +7,30 @@ struct CodeBlock: View {
     let colorScheme: ColorScheme
     let commonPrecedingSpaceCount: Int
     let highlightedCode: [NSAttributedString]
+    let firstLinePrecedingSpaceCount: Int
 
-    init(code: String, language: String, startLineIndex: Int, colorScheme: ColorScheme) {
+    init(
+        code: String,
+        language: String,
+        startLineIndex: Int,
+        colorScheme: ColorScheme,
+        firstLinePrecedingSpaceCount: Int = 0
+    ) {
         self.code = code
         self.language = language
         self.startLineIndex = startLineIndex
         self.colorScheme = colorScheme
+        self.firstLinePrecedingSpaceCount = firstLinePrecedingSpaceCount
+        let padding = firstLinePrecedingSpaceCount > 0
+            ? String(repeating: " ", count: firstLinePrecedingSpaceCount)
+            : ""
         let result = Self.highlight(
-            code: code,
+            code: padding + code,
             language: language,
             colorScheme: colorScheme
         )
-        self.commonPrecedingSpaceCount = result.commonLeadingSpaceCount
-        self.highlightedCode = result.code
+        commonPrecedingSpaceCount = result.commonLeadingSpaceCount
+        highlightedCode = result.code
     }
 
     var body: some View {

Core/Sources/SuggestionWidget/SuggestionPanelContent/PromptToCodePanel.swift

@@ -24,7 +24,8 @@ struct PromptToCodePanel: View {
                             code: provider.code,
                             language: provider.language,
                             startLineIndex: provider.startLineIndex,
-                            colorScheme: colorScheme
+                            colorScheme: colorScheme,
+                            firstLinePrecedingSpaceCount: provider.startLineColumn
                         )
                         .frame(maxWidth: .infinity)
                     }