Skip to content

[pull] main from intitni:main #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Jul 18, 2023
Merged

[pull] main from intitni:main #13

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
587a05f
Update accepting suggestion to handle the case where the suffix of a …
intitni Jul 18, 2023
94a480f
Fix FetchSuggestionTests
intitni Jul 18, 2023
e5a836b
Fix unit tests
intitni Jul 18, 2023
509273c
Merge branch 'hotfix/accepting-suggestion-keep-typing-has-suffix'
intitni Jul 18, 2023
3722336
Fix accepting suggestion
intitni Jul 18, 2023
7dc4607
Merge branch 'hotfix/fix-accept-suggestion'
intitni Jul 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions Core/Sources/SuggestionInjector/SuggestionInjector.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,19 +176,28 @@ public struct SuggestionInjector {

// appending suffix text not in range if needed.
let skipAppendingDueToContinueTyping = {
guard let first = toBeInserted.first?.dropLast(1), !first.isEmpty else { return false }
let droppedLast = lastRemovedLine?.dropLast(1)
guard let first = toBeInserted.first?
.dropLast((toBeInserted.first?.hasSuffix("\n") ?? false) ? 1 : 0),
!first.isEmpty else { return false }
guard let last = toBeInserted.last?
.dropLast((toBeInserted.last?.hasSuffix("\n") ?? false) ? 1 : 0),
!last.isEmpty else { return false }
let droppedLast = lastRemovedLine?
.dropLast((lastRemovedLine?.hasSuffix("\n") ?? false) ? 1 : 0)
guard let droppedLast, !droppedLast.isEmpty else { return false }
// case 1: user keeps typing as the suggestion suggests.
if first.hasPrefix(droppedLast) {
return true
}
// case 2: user also typed the suffix of the suggestion (or auto-completed by Xcode)
if end.character < droppedLast.count - 1 {
let splitIndex = droppedLast.index(droppedLast.startIndex, offsetBy: end.character)
if cursorPosition.character < droppedLast.count {
let splitIndex = droppedLast.index(
droppedLast.startIndex,
offsetBy: cursorPosition.character
)
let prefix = droppedLast[..<splitIndex]
let suffix = droppedLast[splitIndex...]
if first.hasPrefix(prefix), first.hasSuffix(suffix) {
if first.hasPrefix(prefix), last.hasSuffix(suffix) {
return true
}
}
Expand Down
73 changes: 57 additions & 16 deletions Core/Tests/SuggestionInjectorTests/AcceptSuggestionTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class AcceptSuggestionTests: XCTestCase {
)
var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 0, character: 1)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand Down Expand Up @@ -69,7 +69,7 @@ final class AcceptSuggestionTests: XCTestCase {

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 0, character: 12)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand Down Expand Up @@ -112,7 +112,7 @@ final class AcceptSuggestionTests: XCTestCase {

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 1, character: 12)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand Down Expand Up @@ -155,7 +155,7 @@ final class AcceptSuggestionTests: XCTestCase {

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 1, character: 12)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand All @@ -177,27 +177,66 @@ final class AcceptSuggestionTests: XCTestCase {

func test_accept_suggestion_overlap_continue_typing_has_suffix_typed() async throws {
let content = """
struct Cat {
var n: String
}
print("")
"""
let text = """
print("Hello World!")
"""
let suggestion = CodeSuggestion(
text: text,
position: .init(line: 0, character: 6),
uuid: "",
range: .init(
start: .init(line: 0, character: 0),
end: .init(line: 0, character: 6)
),
displayText: ""
)

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 7)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
completion: suggestion,
extraInfo: &extraInfo
)
XCTAssertTrue(extraInfo.didChangeContent)
XCTAssertTrue(extraInfo.didChangeCursorPosition)
XCTAssertNil(extraInfo.suggestionRange)
XCTAssertEqual(lines, content.breakLines().applying(extraInfo.modifications))
XCTAssertEqual(cursor, .init(line: 0, character: 21))
XCTAssertEqual(lines.joined(separator: ""), """
print("Hello World!")

""")
}

func test_accept_suggestion_overlap_continue_typing_has_suffix_typed_suggestion_has_multiple_lines() async throws {
let content = """
struct Cat {}
"""
let text = """
struct Cat {
var name: String
var kind: String
}
"""
let suggestion = CodeSuggestion(
text: text,
position: .init(line: 1, character: 9),
position: .init(line: 0, character: 6),
uuid: "",
range: .init(
start: .init(line: 1, character: 0),
end: .init(line: 1, character: 9)
start: .init(line: 0, character: 0),
end: .init(line: 0, character: 6)
),
displayText: ""
)

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 0, character: 12)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand All @@ -208,11 +247,13 @@ final class AcceptSuggestionTests: XCTestCase {
XCTAssertTrue(extraInfo.didChangeCursorPosition)
XCTAssertNil(extraInfo.suggestionRange)
XCTAssertEqual(lines, content.breakLines().applying(extraInfo.modifications))
XCTAssertEqual(cursor, .init(line: 1, character: 20))
XCTAssertEqual(cursor, .init(line: 3, character: 1))
XCTAssertEqual(lines.joined(separator: ""), """
struct Cat {
var name: String
var kind: String
}

""")
}

Expand Down Expand Up @@ -240,7 +281,7 @@ final class AcceptSuggestionTests: XCTestCase {

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 0, character: 18)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand Down Expand Up @@ -287,7 +328,7 @@ final class AcceptSuggestionTests: XCTestCase {

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 0, character: 18)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand Down Expand Up @@ -337,7 +378,7 @@ final class AcceptSuggestionTests: XCTestCase {

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 0, character: 7)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand Down Expand Up @@ -384,7 +425,7 @@ final class AcceptSuggestionTests: XCTestCase {

var extraInfo = SuggestionInjector.ExtraInfo()
var lines = content.breakLines()
var cursor = CursorPosition(line: 0, character: 0)
var cursor = CursorPosition(line: 5, character: 34)
SuggestionInjector().acceptSuggestion(
intoContentWithoutSuggestion: &lines,
cursorPosition: &cursor,
Expand Down