Skip to content

Commit f8a2413

Browse files
committed
Add originalContent to SuggestionRequest
1 parent cbeaae6 commit f8a2413

5 files changed

Lines changed: 11 additions & 3 deletions

File tree

Pro

Submodule Pro updated from 2da51b1 to 1536c90

Tool/Sources/BuiltinExtension/BuiltinExtensionSuggestionServiceProvider.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ public final class BuiltinExtensionSuggestionServiceProvider<
5454
language: .init(
5555
rawValue: languageIdentifierFromFileURL(request.fileURL).rawValue
5656
) ?? .plaintext,
57-
content: request.content,
57+
content: request.content,
58+
originalContent: request.originalContent,
5859
cursorPosition: .init(
5960
line: request.cursorPosition.line,
6061
character: request.cursorPosition.character
@@ -109,6 +110,7 @@ extension SuggestionProvider.SuggestionRequest {
109110
language: .init(rawValue: languageIdentifierFromFileURL(fileURL).rawValue)
110111
?? .plaintext,
111112
content: content,
113+
originalContent: originalContent,
112114
cursorPosition: .init(
113115
line: cursorPosition.line,
114116
character: cursorPosition.character

Tool/Sources/GitHubCopilotService/Services/GitHubCopilotSuggestionService.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public final class GitHubCopilotSuggestionService: SuggestionServiceType {
2626
return try await service.getCompletions(
2727
fileURL: request.fileURL,
2828
content: request.content,
29+
originalContent: request.originalContent,
2930
cursorPosition: .init(
3031
line: request.cursorPosition.line,
3132
character: request.cursorPosition.character

Tool/Sources/SuggestionProvider/SuggestionProvider.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public struct SuggestionRequest {
1010
public var fileURL: URL
1111
public var relativePath: String
1212
public var content: String
13+
public var originalContent: String
1314
public var lines: [String]
1415
public var cursorPosition: CursorPosition
1516
public var cursorOffset: Int
@@ -22,6 +23,7 @@ public struct SuggestionRequest {
2223
fileURL: URL,
2324
relativePath: String,
2425
content: String,
26+
originalContent: String,
2527
lines: [String],
2628
cursorPosition: CursorPosition,
2729
cursorOffset: Int,
@@ -33,6 +35,7 @@ public struct SuggestionRequest {
3335
self.fileURL = fileURL
3436
self.relativePath = relativePath
3537
self.content = content
38+
self.originalContent = content
3639
self.lines = lines
3740
self.cursorPosition = cursorPosition
3841
self.cursorOffset = cursorOffset

Tool/Sources/WorkspaceSuggestionService/Workspace+SuggestionService.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,13 @@ public extension Workspace {
5454
filespace.suggestionSourceSnapshot = snapshot
5555

5656
guard let suggestionService else { throw SuggestionFeatureDisabledError() }
57+
let content = editor.lines.joined(separator: "")
5758
let completions = try await suggestionService.getSuggestions(
5859
.init(
5960
fileURL: fileURL,
6061
relativePath: fileURL.path.replacingOccurrences(of: projectRootURL.path, with: ""),
61-
content: editor.lines.joined(separator: ""),
62+
content: content,
63+
originalContent: content,
6264
lines: editor.lines,
6365
cursorPosition: editor.cursorPosition,
6466
cursorOffset: editor.cursorOffset,

0 commit comments

Comments
 (0)