Skip to content

Commit 519cce1

Browse files
committed
Stop handling multiple selections in modification
1 parent 415088e commit 519cce1

1 file changed

Lines changed: 10 additions & 28 deletions

File tree

Core/Sources/Service/SuggestionCommandHandler/WindowBaseCommandHandler.swift

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ extension WindowBaseCommandHandler {
357357
) async throws {
358358
guard let fileURL = await XcodeInspector.shared.safe.realtimeActiveDocumentURL
359359
else { return }
360-
let (workspace, filespace) = try await Service.shared.workspacePool
360+
let (workspace, _) = try await Service.shared.workspacePool
361361
.fetchOrCreateWorkspaceAndFilespace(fileURL: fileURL)
362362
guard workspace.suggestionPlugin?.isSuggestionFeatureEnabled ?? false else {
363363
presenter.presentErrorMessage("Prompt to code is disabled for this project")
@@ -367,34 +367,16 @@ extension WindowBaseCommandHandler {
367367
let codeLanguage = languageIdentifierFromFileURL(fileURL)
368368

369369
let selections: [CursorRange] = {
370-
var all = [CursorRange]()
371-
372-
// join the ranges if they overlaps in line
373-
374-
for selection in editor.selections {
375-
let range = CursorRange(start: selection.start, end: selection.end)
376-
377-
func intersect(_ lhs: CursorRange, _ rhs: CursorRange) -> Bool {
378-
lhs.start.line <= rhs.end.line && lhs.end.line >= rhs.start.line
379-
}
380-
381-
if let last = all.last, intersect(last, range) {
382-
all[all.count - 1] = CursorRange(
383-
start: .init(
384-
line: min(last.start.line, range.start.line),
385-
character: min(last.start.character, range.start.character)
386-
),
387-
end: .init(
388-
line: max(last.end.line, range.end.line),
389-
character: max(last.end.character, range.end.character)
390-
)
391-
)
392-
} else {
393-
all.append(range)
394-
}
370+
if let firstSelection = editor.selections.first,
371+
let lastSelection = editor.selections.last
372+
{
373+
let range = CursorRange(
374+
start: firstSelection.start,
375+
end: lastSelection.end
376+
)
377+
return [range]
395378
}
396-
397-
return all
379+
return []
398380
}()
399381

400382
let snippets = selections.map { selection in

0 commit comments

Comments
 (0)