Update UpdatedContent to return a selection range

intitni · intitni · commit ddd23b437b0e · 2023-04-12T21:29:10.000+08:00
diff --git a/Core/Sources/CopilotModel/ExportedFromLSP.swift b/Core/Sources/CopilotModel/ExportedFromLSP.swift
@@ -9,4 +9,7 @@ public extension CursorPosition {
 
 public extension CursorRange {
     static var outOfScope: CursorRange { .init(start: .outOfScope, end: .outOfScope) }
+    static func cursor(_ position: CursorPosition) -> CursorRange {
+        return .init(start: position, end: position)
+    }
 }
diff --git a/Core/Sources/Service/SuggestionCommandHandler/CommentBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/CommentBaseCommandHandler.swift
@@ -103,7 +103,7 @@ struct CommentBaseCommandHandler: SuggestionCommandHandler {
 
         return .init(
             content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
+            newSelection: .cursor(cursorPosition),
             modifications: extraInfo.modifications
         )
     }
diff --git a/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/PseudoCommandHandler.swift
@@ -108,7 +108,8 @@ struct PseudoCommandHandler {
                         .presentErrorMessage("Fail to set editor content.")
                 }
 
-                if let cursor = result.newCursor {
+                #warning("MUSTDO: handle range")
+                if let cursor = result.newSelection?.start {
                     var range = convertCursorPositionToRange(cursor, in: result.content)
                     if let value = AXValueCreate(.cfRange, &range) {
                         AXUIElementSetAttributeValue(
diff --git a/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift b/Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift
@@ -136,47 +136,55 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
     func acceptSuggestion(editor: EditorContent) async throws -> UpdatedContent? {
         presenter.markAsProcessing(true)
         defer { presenter.markAsProcessing(false) }
-        
+
         let fileURL = try await Environment.fetchCurrentFileURL()
         let (workspace, _) = try await Workspace.fetchOrCreateWorkspaceIfNeeded(fileURL: fileURL)
 
-        let result: (suggestion: CopilotCompletion, cleanup: () -> Void)? = {
+        let result: (
+            suggestion: CopilotCompletion,
+            cleanup: () -> Void,
+            startPosition: CursorPosition?
+        )? = {
             if let service = WidgetDataSource.shared.promptToCodes[fileURL]?.promptToCodeService {
-                return (CopilotCompletion(
-                    text: service.code,
-                    position: service.selectionRange.start,
-                    uuid: UUID().uuidString,
-                    range: service.selectionRange,
-                    displayText: service.code
-                ), {
-                    WidgetDataSource.shared.removePromptToCode(for: fileURL)
-                    presenter.closePromptToCode(fileURL: fileURL)
-                })
+                return (
+                    CopilotCompletion(
+                        text: service.code,
+                        position: service.selectionRange.start,
+                        uuid: UUID().uuidString,
+                        range: service.selectionRange,
+                        displayText: service.code
+                    ),
+                    {
+                        WidgetDataSource.shared.removePromptToCode(for: fileURL)
+                        presenter.closePromptToCode(fileURL: fileURL)
+                    },
+                    service.selectionRange.start
+                )
             }
-            
+
             if let acceptedSuggestion = workspace.acceptSuggestion(
                 forFileAt: fileURL,
                 editor: editor
             ) {
-                return (acceptedSuggestion, {
-                    presenter.discardSuggestion(fileURL: fileURL)
-                })
+                return (
+                    acceptedSuggestion,
+                    {
+                        presenter.discardSuggestion(fileURL: fileURL)
+                    },
+                    nil
+                )
             }
-            
+
             return nil
         }()
-        
+
         guard let result else { return nil }
-        
+
         let injector = SuggestionInjector()
         var lines = editor.lines
         var cursorPosition = editor.cursorPosition
         var extraInfo = SuggestionInjector.ExtraInfo()
-        injector.rejectCurrentSuggestions(
-            from: &lines,
-            cursorPosition: &cursorPosition,
-            extraInfo: &extraInfo
-        )
+
         injector.acceptSuggestion(
             intoContentWithoutSuggestion: &lines,
             cursorPosition: &cursorPosition,
@@ -185,11 +193,16 @@ struct WindowBaseCommandHandler: SuggestionCommandHandler {
         )
 
         result.cleanup()
-        
+
         return .init(
             content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
-            modifications: extraInfo.modifications
+            newSelection: {
+                if let startPosition = result.startPosition {
+                    return .init(start: startPosition, end: cursorPosition)
+                }
+                return .cursor(cursorPosition)
+            }(),
+            modifications : extraInfo.modifications
         )
     }
 
diff --git a/Core/Sources/Service/SuggestionPresenter/PresentInCommentSuggestionPresenter.swift b/Core/Sources/Service/SuggestionPresenter/PresentInCommentSuggestionPresenter.swift
@@ -25,7 +25,7 @@ struct PresentInCommentSuggestionPresenter {
         guard let completion = await filespace.presentingSuggestion else {
             return .init(
                 content: originalContent,
-                newCursor: cursorPosition,
+                newSelection: .cursor(cursorPosition),
                 modifications: extraInfo.modifications
             )
         }
@@ -40,7 +40,7 @@ struct PresentInCommentSuggestionPresenter {
 
         return .init(
             content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
+            newSelection: .cursor(cursorPosition),
             modifications: extraInfo.modifications
         )
     }
@@ -65,7 +65,7 @@ struct PresentInCommentSuggestionPresenter {
 
         return .init(
             content: String(lines.joined(separator: "")),
-            newCursor: cursorPosition,
+            newSelection: .cursor(cursorPosition),
             modifications: extraInfo.modifications
         )
     }
diff --git a/Core/Sources/XPCShared/Models.swift b/Core/Sources/XPCShared/Models.swift
@@ -47,14 +47,14 @@ public struct EditorContent: Codable {
 }
 
 public struct UpdatedContent: Codable {
-    public init(content: String, newCursor: CursorPosition? = nil, modifications: [Modification]) {
+    public init(content: String, newSelection: CursorRange? = nil, modifications: [Modification]) {
         self.content = content
-        self.newCursor = newCursor
+        self.newSelection = newSelection
         self.modifications = modifications
     }
 
     public var content: String
-    public var newCursor: CursorPosition?
+    public var newSelection: CursorRange?
     public var modifications: [Modification]
 }
 
diff --git a/EditorExtension/Helpers.swift b/EditorExtension/Helpers.swift
@@ -19,15 +19,15 @@ extension XCSourceEditorCommandInvocation {
     }
 
     func accept(_ updatedContent: UpdatedContent) {
-        if let newCursor = updatedContent.newCursor {
+        if let newSelection = updatedContent.newSelection {
             mutateCompleteBuffer(
                 modifications: updatedContent.modifications,
                 restoringSelections: false
             )
             buffer.selections.removeAllObjects()
             buffer.selections.add(XCSourceTextRange(
-                start: .init(line: newCursor.line, column: newCursor.character),
-                end: .init(line: newCursor.line, column: newCursor.character)
+                start: .init(line: newSelection.start.line, column: newSelection.start.character),
+                end: .init(line: newSelection.end.line, column: newSelection.end.character)
             ))
         } else {
             mutateCompleteBuffer(

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,7 @@ public extension CursorPosition {`
`9`	`9`
`10`	`10`	`public extension CursorRange {`
`11`	`11`	`static var outOfScope: CursorRange { .init(start: .outOfScope, end: .outOfScope) }`
	`12`	`+ static func cursor(_ position: CursorPosition) -> CursorRange {`
	`13`	`+ return .init(start: position, end: position)`
	`14`	`+ }`
`12`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ struct CommentBaseCommandHandler: SuggestionCommandHandler {`
`103`	`103`
`104`	`104`	`return .init(`
`105`	`105`	`content: String(lines.joined(separator: "")),`
`106`		`- newCursor: cursorPosition,`
	`106`	`+ newSelection: .cursor(cursorPosition),`
`107`	`107`	`modifications: extraInfo.modifications`
`108`	`108`	`)`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,8 @@ struct PseudoCommandHandler {`
`108`	`108`	`.presentErrorMessage("Fail to set editor content.")`
`109`	`109`	`}`
`110`	`110`
`111`		`- if let cursor = result.newCursor {`
	`111`	`+ #warning("MUSTDO: handle range")`
	`112`	`+ if let cursor = result.newSelection?.start {`
`112`	`113`	`var range = convertCursorPositionToRange(cursor, in: result.content)`
`113`	`114`	`if let value = AXValueCreate(.cfRange, &range) {`
`114`	`115`	`AXUIElementSetAttributeValue(`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ struct PresentInCommentSuggestionPresenter {`
`25`	`25`	`guard let completion = await filespace.presentingSuggestion else {`
`26`	`26`	`return .init(`
`27`	`27`	`content: originalContent,`
`28`		`- newCursor: cursorPosition,`
	`28`	`+ newSelection: .cursor(cursorPosition),`
`29`	`29`	`modifications: extraInfo.modifications`
`30`	`30`	`)`
`31`	`31`	`}`
`@@ -40,7 +40,7 @@ struct PresentInCommentSuggestionPresenter {`
`40`	`40`
`41`	`41`	`return .init(`
`42`	`42`	`content: String(lines.joined(separator: "")),`
`43`		`- newCursor: cursorPosition,`
	`43`	`+ newSelection: .cursor(cursorPosition),`
`44`	`44`	`modifications: extraInfo.modifications`
`45`	`45`	`)`
`46`	`46`	`}`
`@@ -65,7 +65,7 @@ struct PresentInCommentSuggestionPresenter {`
`65`	`65`
`66`	`66`	`return .init(`
`67`	`67`	`content: String(lines.joined(separator: "")),`
`68`		`- newCursor: cursorPosition,`
	`68`	`+ newSelection: .cursor(cursorPosition),`
`69`	`69`	`modifications: extraInfo.modifications`
`70`	`70`	`)`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,14 @@ public struct EditorContent: Codable {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public struct UpdatedContent: Codable {`
`50`		`- public init(content: String, newCursor: CursorPosition? = nil, modifications: [Modification]) {`
	`50`	`+ public init(content: String, newSelection: CursorRange? = nil, modifications: [Modification]) {`
`51`	`51`	`self.content = content`
`52`		`- self.newCursor = newCursor`
	`52`	`+ self.newSelection = newSelection`
`53`	`53`	`self.modifications = modifications`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public var content: String`
`57`		`- public var newCursor: CursorPosition?`
	`57`	`+ public var newSelection: CursorRange?`
`58`	`58`	`public var modifications: [Modification]`
`59`	`59`	`}`
`60`	`60`