[pull] main from intitni:main

Core/Sources/GitHubCopilotService/GitHubCopilotService.swift

@@ -23,7 +23,8 @@ public protocol GitHubCopilotSuggestionServiceType {
         tabSize: Int,
         indentSize: Int,
         usesTabsForIndentation: Bool,
-        ignoreSpaceOnlySuggestions: Bool
+        ignoreSpaceOnlySuggestions: Bool,
+        ignoreTrailingNewLinesAndSpaces: Bool
     ) async throws -> [CodeSuggestion]
     func notifyAccepted(_ completion: CodeSuggestion) async
     func notifyRejected(_ completions: [CodeSuggestion]) async
@@ -269,7 +270,8 @@ public final class GitHubCopilotSuggestionService: GitHubCopilotBaseService,
         tabSize: Int,
         indentSize: Int,
         usesTabsForIndentation: Bool,
-        ignoreSpaceOnlySuggestions: Bool
+        ignoreSpaceOnlySuggestions: Bool,
+        ignoreTrailingNewLinesAndSpaces: Bool
     ) async throws -> [CodeSuggestion] {
         let languageId = languageIdentifierFromFileURL(fileURL)
 
@@ -313,7 +315,7 @@ public final class GitHubCopilotSuggestionService: GitHubCopilotBaseService,
                     return true
                 }
                 .map {
-                    if UserDefaults.shared.value(for: \.gitHubCopilotIgnoreTrailingNewLines) {
+                    if ignoreTrailingNewLinesAndSpaces {
                         var updated = $0
                         var text = updated.text[...]
                         while let last = text.last, last.isNewline || last.isWhitespace {

Core/Sources/PromptToCodeService/CopilotPromptToCodeAPI.swift

@@ -70,7 +70,8 @@ final class CopilotPromptToCodeAPI: PromptToCodeAPI {
                         tabSize: indentSize,
                         indentSize: indentSize,
                         usesTabsForIndentation: usesTabsForIndentation,
-                        ignoreSpaceOnlySuggestions: true
+                        ignoreSpaceOnlySuggestions: true,
+                        ignoreTrailingNewLinesAndSpaces: false
                     )
                     try Task.checkCancellation()
                     guard let first = result.first else { throw CancellationError() }

Core/Sources/SuggestionInjector/SuggestionInjector.swift

@@ -1,5 +1,5 @@
-import SuggestionModel
 import Foundation
+import SuggestionModel
 
 let suggestionStart = "/*========== Copilot Suggestion"
 let suggestionEnd = "*///======== End of Copilot Suggestion"
@@ -141,8 +141,6 @@ public struct SuggestionInjector {
         let end = completion.range.end
         let suggestionContent = completion.text
 
-        let _ = start.line < content.endIndex ? content[start.line] : nil
-
         let firstRemovedLine = content[safe: start.line]
         let lastRemovedLine = content[safe: end.line]
         let startLine = max(0, start.line)
@@ -177,12 +175,33 @@ public struct SuggestionInjector {
         }
 
         // appending suffix text not in range if needed.
-        let cursorCol = toBeInserted[toBeInserted.endIndex - 1].count - 1
         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 }
-            return first.hasPrefix(droppedLast)
+            // 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 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), last.hasSuffix(suffix) {
+                    return true
+                }
+            }
+            return false
         }()
         if let lastRemovedLine,
            !skipAppendingDueToContinueTyping,
@@ -200,11 +219,12 @@ public struct SuggestionInjector {
                 toBeInserted[toBeInserted.endIndex - 1].removeLast(1)
             }
             let leftover = lastRemovedLine[leftoverRange]
-            
+
             toBeInserted[toBeInserted.endIndex - 1]
                 .append(contentsOf: leftover)
         }
 
+        let cursorCol = toBeInserted[toBeInserted.endIndex - 1].count - 1
         let insertingIndex = min(start.line, content.endIndex)
         content.insert(contentsOf: toBeInserted, at: insertingIndex)
         extraInfo.modifications.append(.inserted(insertingIndex, toBeInserted))
@@ -270,3 +290,4 @@ extension Array {
         indices.contains(index) ? self[index] : nil
     }
 }
+

Core/Sources/SuggestionService/GitHubCopilotSuggestionProvider.swift

@@ -42,7 +42,9 @@ extension GitHubCopilotSuggestionProvider {
             tabSize: tabSize,
             indentSize: indentSize,
             usesTabsForIndentation: usesTabsForIndentation,
-            ignoreSpaceOnlySuggestions: ignoreSpaceOnlySuggestions
+            ignoreSpaceOnlySuggestions: ignoreSpaceOnlySuggestions,
+            ignoreTrailingNewLinesAndSpaces: UserDefaults.shared
+                .value(for: \.gitHubCopilotIgnoreTrailingNewLines)
         )
     }
 
@@ -73,12 +75,12 @@ extension GitHubCopilotSuggestionProvider {
         try await (try? createGitHubCopilotServiceIfNeeded())?
             .notifySaveTextDocument(fileURL: fileURL)
     }
-    
+
     func cancelRequest() async {
         await (try? createGitHubCopilotServiceIfNeeded())?
             .cancelRequest()
     }
-    
+
     func terminate() async {
         await (try? createGitHubCopilotServiceIfNeeded())?.terminate()
     }

Core/Tests/GitHubCopilotServiceTests/FetchSuggestionsTests.swift

@@ -4,7 +4,7 @@ import XCTest
 @testable import GitHubCopilotService
 
 final class FetchSuggestionTests: XCTestCase {
-    func test_process_sugestions_from_server() async throws {
+    func test_process_suggestions_from_server() async throws {
         struct TestServer: GitHubCopilotLSP {
             func sendNotification(_ notif: LanguageServerProtocol.ClientNotification) async throws {
                 fatalError()
@@ -44,7 +44,8 @@ final class FetchSuggestionTests: XCTestCase {
             tabSize: 4,
             indentSize: 4,
             usesTabsForIndentation: false,
-            ignoreSpaceOnlySuggestions: false
+            ignoreSpaceOnlySuggestions: false,
+            ignoreTrailingNewLinesAndSpaces: false
         )
         XCTAssertEqual(completions.count, 3)
     }
@@ -89,7 +90,8 @@ final class FetchSuggestionTests: XCTestCase {
             tabSize: 4,
             indentSize: 4,
             usesTabsForIndentation: false,
-            ignoreSpaceOnlySuggestions: true
+            ignoreSpaceOnlySuggestions: true,
+            ignoreTrailingNewLinesAndSpaces: false
         )
         XCTAssertEqual(completions.count, 1)
         XCTAssertEqual(completions.first?.text, "Hello World\n")
@@ -128,9 +130,10 @@ final class FetchSuggestionTests: XCTestCase {
             tabSize: 4,
             indentSize: 4,
             usesTabsForIndentation: false,
-            ignoreSpaceOnlySuggestions: false
+            ignoreSpaceOnlySuggestions: false,
+            ignoreTrailingNewLinesAndSpaces: true
         )
         XCTAssertEqual(completions.count, 1)
-        XCTAssertEqual(completions.first?.text, "Hello World\n")
+        XCTAssertEqual(completions.first?.text, "Hello World")
     }
 }

Core/Tests/ServiceTests/Environment.swift

@@ -71,7 +71,8 @@ class MockSuggestionService: GitHubCopilotSuggestionServiceType {
         tabSize: Int,
         indentSize: Int,
         usesTabsForIndentation: Bool,
-        ignoreSpaceOnlySuggestions: Bool
+        ignoreSpaceOnlySuggestions: Bool,
+        ignoreTrailingNewLinesAndSpaces: Bool
     ) async throws -> [SuggestionModel.CodeSuggestion] {
         completions
     }

Core/Tests/SuggestionInjectorTests/AcceptSuggestionTests.swift

@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -174,6 +174,88 @@ final class AcceptSuggestionTests: XCTestCase {
         }
         """)
     }
+
+    func test_accept_suggestion_overlap_continue_typing_has_suffix_typed() async throws {
+        let content = """
+        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: 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: 12)
+        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: 3, character: 1))
+        XCTAssertEqual(lines.joined(separator: ""), """
+        struct Cat {
+            var name: String
+            var kind: String
+        }
+
+        """)
+    }
 
     func test_propose_suggestion_partial_overlap() async throws {
         let content = "func quickSort() {}}\n"
@@ -199,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,
@@ -246,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,
@@ -296,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,
@@ -308,7 +390,7 @@ final class AcceptSuggestionTests: XCTestCase {
         XCTAssertTrue(extraInfo.didChangeCursorPosition)
         XCTAssertNil(extraInfo.suggestionRange)
         XCTAssertEqual(lines, content.breakLines().applying(extraInfo.modifications))
-        XCTAssertEqual(cursor, .init(line: 4, character: 1))
+        XCTAssertEqual(cursor, .init(line: 4, character: 0))
         XCTAssertEqual(lines.joined(separator: ""), text)
     }
 
@@ -343,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,

Tool/Tests/LangChainTests/TextSplitterTests/TextSplitterTests.swift

@@ -58,7 +58,7 @@ final class TextSplitterTests: XCTestCase {
 
         XCTAssertEqual(
             result,
-            ["Madam Speaker,", " Madam Vice", " President, our", " our First"]
+            ["Madam Speaker,", "Madam Vice", "President, our", "our First"]
         )
         XCTAssertTrue(result.allSatisfy { $0.count <= 15 })
     }