Fix that a wrong suffix was append to the suggestion

Author: intitni

Core/Sources/Service/GUI/WidgetDataSource.swift

@@ -26,6 +26,7 @@ extension WidgetDataSource: SuggestionWidgetDataSource {
                     suggestionCount: filespace.suggestions.count,
                     currentSuggestionIndex: filespace.suggestionIndex,
                     replacingRange: suggestion.range,
+                    replacingLines: suggestion.replacingLines,
                     descriptions: suggestion.descriptions
                 )
             }

Core/Sources/SuggestionService/SuggestionService.swift

@@ -84,7 +84,16 @@ public extension SuggestionService {
                 }
             }
 
-            return try await getSuggestion(request, workspaceInfo)
+            var result = try await getSuggestion(request, workspaceInfo)
+            if !request.lines.isEmpty {
+                for index in result.indices {
+                    let range = result[index].range
+                    let lowerBound = max(0, range.start.line)
+                    let upperBound = max(lowerBound, min(request.lines.count - 1, range.end.line))
+                    result[index].replacingLines = Array(request.lines[lowerBound...upperBound])
+                }
+            }
+            return result
         } catch let error as SuggestionServiceError {
             throw error
         } catch {

Core/Sources/SuggestionWidget/SharedPanelView.swift

@@ -164,7 +164,8 @@ struct SharedPanelView_Both_DisplayingSuggestion_Preview: PreviewProvider {
                         startLineIndex: 8,
                         suggestionCount: 2,
                         currentSuggestionIndex: 0,
-                        replacingRange: .zero
+                        replacingRange: .zero,
+                        replacingLines: [""]
                     )
                 ),
                 colorScheme: .dark,

Core/Sources/SuggestionWidget/SuggestionPanelContent/CodeBlockSuggestionPanel.swift

@@ -14,6 +14,7 @@ public struct PresentingCodeSuggestion: Equatable {
     public var suggestionCount: Int
     public var currentSuggestionIndex: Int
     public var replacingRange: CursorRange
+    public var replacingLines: [String]
     public var descriptions: [CodeSuggestion.Description]
 
     public init(
@@ -23,6 +24,7 @@ public struct PresentingCodeSuggestion: Equatable {
         suggestionCount: Int,
         currentSuggestionIndex: Int,
         replacingRange: CursorRange,
+        replacingLines: [String],
         descriptions: [CodeSuggestion.Description] = []
     ) {
         self.code = code
@@ -31,6 +33,7 @@ public struct PresentingCodeSuggestion: Equatable {
         self.suggestionCount = suggestionCount
         self.currentSuggestionIndex = currentSuggestionIndex
         self.replacingRange = replacingRange
+        self.replacingLines = replacingLines
         self.descriptions = descriptions
     }
 }
@@ -231,8 +234,10 @@ struct CodeBlockSuggestionPanel: View {
         originalCode: String,
         dimmedCharacterCount: AsyncCodeBlock.DimmedCharacterCount
     ) {
-        let range = suggestion.replacingRange
-        let codeInRange = EditorInformation.code(in: textCursorTracker.content.lines, inside: range)
+        var range = suggestion.replacingRange
+        range.end = .init(line: range.end.line - range.start.line, character: range.end.character)
+        range.start = .init(line: 0, character: range.start.character)
+        let codeInRange = EditorInformation.code(in: suggestion.replacingLines, inside: range)
         let leftover = {
             if range.end.line >= 0, range.end.line < textCursorTracker.content.lines.endIndex {
                 let lastLine = textCursorTracker.content.lines[range.end.line]
@@ -253,7 +258,7 @@ struct CodeBlockSuggestionPanel: View {
 
         let prefix = {
             if range.start.line >= 0, range.start.line < textCursorTracker.content.lines.endIndex {
-                let firstLine = textCursorTracker.content.lines[range.start.line]
+                let firstLine = suggestion.replacingLines[range.start.line]
                 if range.start.character < firstLine.utf16.count {
                     let endIndex = firstLine.utf16.index(
                         firstLine.utf16.startIndex,
@@ -296,7 +301,8 @@ struct CodeBlockSuggestionPanel: View {
         startLineIndex: 8,
         suggestionCount: 2,
         currentSuggestionIndex: 0,
-        replacingRange: .outOfScope
+        replacingRange: .outOfScope,
+        replacingLines: []
     ), suggestionDisplayCompactMode: .init(
         wrappedValue: false,
         "suggestionDisplayCompactMode",
@@ -325,7 +331,8 @@ struct CodeBlockSuggestionPanel: View {
         startLineIndex: 8,
         suggestionCount: 2,
         currentSuggestionIndex: 0,
-        replacingRange: .outOfScope
+        replacingRange: .outOfScope,
+        replacingLines: []
     ), suggestionDisplayCompactMode: .init(
         wrappedValue: true,
         "suggestionDisplayCompactMode",
@@ -352,7 +359,8 @@ struct CodeBlockSuggestionPanel: View {
         startLineIndex: 8,
         suggestionCount: 2,
         currentSuggestionIndex: 0,
-        replacingRange: .outOfScope
+        replacingRange: .outOfScope,
+        replacingLines: []
     ))
     .preferredColorScheme(.light)
     .frame(width: 450, height: 400)

Core/Sources/SuggestionWidget/SuggestionWidgetDataSource.swift

@@ -18,7 +18,8 @@ struct MockWidgetDataSource: SuggestionWidgetDataSource {
             startLineIndex: 1,
             suggestionCount: 3,
             currentSuggestionIndex: 0,
-            replacingRange: .zero
+            replacingRange: .zero, 
+            replacingLines: []
         )
     }
 }

Tool/Sources/SuggestionBasic/CodeSuggestion.swift

@@ -22,6 +22,7 @@ public struct CodeSuggestion: Codable, Equatable {
         text: String,
         position: CursorPosition,
         range: CursorRange,
+        replacingLines: [String] = [],
         descriptions: [Description] = [],
         middlewareComments: [String] = [],
         metadata: [String: String] = [:]
@@ -30,6 +31,7 @@ public struct CodeSuggestion: Codable, Equatable {
         self.position = position
         self.id = id
         self.range = range
+        self.replacingLines = replacingLines
         self.descriptions = descriptions
         self.middlewareComments = middlewareComments
         self.metadata = metadata
@@ -53,6 +55,8 @@ public struct CodeSuggestion: Codable, Equatable {
     /// The range of the original code that should be replaced.
     public var range: CursorRange
     /// Descriptions about this code suggestion
+    @FallbackDecoding<EmptyArray> public var replacingLines: [String]
+    /// Descriptions about this code suggestion
     @FallbackDecoding<EmptyArray> public var descriptions: [Description]
     /// A place to store comments inserted by middleware for debugging use.
     @FallbackDecoding<EmptyArray> public var middlewareComments: [String]