Add cursorOffset to editor content and suggestion request

Author: intitni

Core/Sources/PromptToCodeService/OpenAIPromptToCodeService.swift

@@ -37,7 +37,8 @@ public final class OpenAIPromptToCodeService: PromptToCodeServiceType {
                     content: source.content,
                     lines: source.lines,
                     selections: [source.range],
-                    cursorPosition: .outOfScope,
+                    cursorPosition: .outOfScope, 
+                    cursorOffset: -1,
                     lineAnnotations: []
                 ),
                 selectedContent: code,

Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift

@@ -23,6 +23,7 @@ struct PseudoCommandHandler {
             lines: [],
             uti: "",
             cursorPosition: .outOfScope,
+            cursorOffset: -1,
             selections: [],
             tabSize: 0,
             indentSize: 0,
@@ -37,6 +38,7 @@ struct PseudoCommandHandler {
             lines: [],
             uti: "",
             cursorPosition: .outOfScope,
+            cursorOffset: -1,
             selections: [],
             tabSize: 0,
             indentSize: 0,
@@ -128,6 +130,7 @@ struct PseudoCommandHandler {
             lines: [],
             uti: "",
             cursorPosition: .outOfScope,
+            cursorOffset: -1,
             selections: [],
             tabSize: 0,
             indentSize: 0,
@@ -148,6 +151,7 @@ struct PseudoCommandHandler {
                     lines: [],
                     uti: "",
                     cursorPosition: .outOfScope,
+                    cursorOffset: -1,
                     selections: [],
                     tabSize: 0,
                     indentSize: 0,
@@ -206,7 +210,7 @@ struct PseudoCommandHandler {
             guard let focusElement = application.focusedElement,
                   focusElement.description == "Source Editor"
             else { return }
-            guard let (content, lines, _, cursorPosition) = await getFileContent(sourceEditor: nil)
+            guard let (content, lines, _, cursorPosition, cursorOffset) = await getFileContent(sourceEditor: nil)
             else {
                 PresentInWindowSuggestionPresenter()
                     .presentErrorMessage("Unable to get file content.")
@@ -219,6 +223,7 @@ struct PseudoCommandHandler {
                     lines: lines,
                     uti: "",
                     cursorPosition: cursorPosition,
+                    cursorOffset: cursorOffset,
                     selections: [],
                     tabSize: 0,
                     indentSize: 0,
@@ -261,7 +266,7 @@ struct PseudoCommandHandler {
             guard let focusElement = application.focusedElement,
                   focusElement.description == "Source Editor"
             else { return }
-            guard let (content, lines, _, cursorPosition) = await getFileContent(sourceEditor: nil)
+            guard let (content, lines, _, cursorPosition, cursorOffset) = await getFileContent(sourceEditor: nil)
             else {
                 PresentInWindowSuggestionPresenter()
                     .presentErrorMessage("Unable to get file content.")
@@ -274,6 +279,7 @@ struct PseudoCommandHandler {
                     lines: lines,
                     uti: "",
                     cursorPosition: cursorPosition,
+                    cursorOffset: cursorOffset,
                     selections: [],
                     tabSize: 0,
                     indentSize: 0,
@@ -361,7 +367,8 @@ extension PseudoCommandHandler {
             content: String,
             lines: [String],
             selections: [CursorRange],
-            cursorPosition: CursorPosition
+            cursorPosition: CursorPosition,
+            cursorOffset: Int
         )?
     {
         guard let xcode = ActiveApplicationMonitor.shared.activeXcode
@@ -374,7 +381,7 @@ extension PseudoCommandHandler {
         let content = focusElement.value
         let split = content.breakLines(appendLineBreakToLastLine: false)
         let range = convertRangeToCursorRange(selectionRange, in: content)
-        return (content, split, [range], range.start)
+        return (content, split, [range], range.start, selectionRange.lowerBound)
     }
 
     func getFileURL() async -> URL? {
@@ -410,6 +417,7 @@ extension PseudoCommandHandler {
             lines: content.lines,
             uti: uti,
             cursorPosition: content.cursorPosition,
+            cursorOffset: content.cursorOffset,
             selections: content.selections.map {
                 .init(start: $0.start, end: $0.end)
             },

EditorExtension/Helpers.swift

@@ -47,7 +47,8 @@ extension EditorContent {
             uti: buffer.contentUTI,
             cursorPosition: ((buffer.selections.lastObject as? XCSourceTextRange)?.end).map {
                 CursorPosition(line: $0.line, character: $0.column)
-            } ?? CursorPosition(line: 0, character: 0),
+            } ?? CursorPosition(line: 0, character: 0), 
+            cursorOffset: -1,
             selections: buffer.selections.map {
                 let sl = ($0 as? XCSourceTextRange)?.start.line ?? 0
                 let sc = ($0 as? XCSourceTextRange)?.start.column ?? 0

Pro

@@ -17,6 +17,8 @@ public struct EditorInformation {
         public var selections: [CursorRange]
         /// The cursor position of the source editor.
         public var cursorPosition: CursorPosition
+        /// The cursor position as offset.
+        public var cursorOffset: Int
         /// Line annotations of the source editor.
         public var lineAnnotations: [LineAnnotation]
 
@@ -41,12 +43,14 @@ public struct EditorInformation {
             lines: [String],
             selections: [CursorRange],
             cursorPosition: CursorPosition,
+            cursorOffset: Int,
             lineAnnotations: [String]
         ) {
             self.content = content
             self.lines = lines
             self.selections = selections
             self.cursorPosition = cursorPosition
+            self.cursorOffset = cursorOffset
             self.lineAnnotations = lineAnnotations.map(EditorInformation.parseLineAnnotation)
         }
     }

Tool/Sources/SuggestionModel/EditorInformation.swift

@@ -11,6 +11,7 @@ public struct SuggestionRequest {
     public var content: String
     public var lines: [String]
     public var cursorPosition: CursorPosition
+    public var cursorOffset: Int
     public var tabSize: Int
     public var indentSize: Int
     public var usesTabsForIndentation: Bool
@@ -23,6 +24,7 @@ public struct SuggestionRequest {
         content: String,
         lines: [String],
         cursorPosition: CursorPosition,
+        cursorOffset: Int,
         tabSize: Int,
         indentSize: Int,
         usesTabsForIndentation: Bool,
@@ -34,6 +36,7 @@ public struct SuggestionRequest {
         self.content = content
         self.lines = lines
         self.cursorPosition = cursorPosition
+        self.cursorOffset = cursorOffset
         self.tabSize = tabSize
         self.indentSize = indentSize
         self.usesTabsForIndentation = usesTabsForIndentation

Tool/Sources/SuggestionProvider/SuggestionProvider.swift

@@ -60,7 +60,8 @@ public extension Workspace {
                 relativePath: fileURL.path.replacingOccurrences(of: projectRootURL.path, with: ""),
                 content: editor.lines.joined(separator: ""),
                 lines: editor.lines,
-                cursorPosition: editor.cursorPosition,
+                cursorPosition: editor.cursorPosition, 
+                cursorOffset: editor.cursorOffset,
                 tabSize: editor.tabSize,
                 indentSize: editor.indentSize,
                 usesTabsForIndentation: editor.usesTabsForIndentation,

Tool/Sources/WorkspaceSuggestionService/Workspace+SuggestionService.swift

@@ -17,6 +17,7 @@ public struct EditorContent: Codable {
         lines: [String],
         uti: String,
         cursorPosition: CursorPosition,
+        cursorOffset: Int,
         selections: [Selection],
         tabSize: Int,
         indentSize: Int,
@@ -26,6 +27,7 @@ public struct EditorContent: Codable {
         self.lines = lines
         self.uti = uti
         self.cursorPosition = cursorPosition
+        self.cursorOffset = cursorOffset
         self.selections = selections
         self.tabSize = tabSize
         self.indentSize = indentSize
@@ -37,6 +39,7 @@ public struct EditorContent: Codable {
     public var lines: [String]
     public var uti: String
     public var cursorPosition: CursorPosition
+    public var cursorOffset: Int
     public var selections: [Selection]
     public var tabSize: Int
     public var indentSize: Int

Tool/Sources/XPCShared/Models.swift

@@ -49,6 +49,7 @@ public class SourceEditor {
             lines: lines,
             selections: selections,
             cursorPosition: selections.first?.start ?? .outOfScope,
+            cursorOffset: selectionRange?.lowerBound ?? 0,
             lineAnnotations: lineAnnotations
         )
     }