Remove the first adjacent placeholder when accepting suggestions

Author: intitni

Core/Sources/SuggestionInjector/SuggestionInjector.swift

@@ -233,10 +233,25 @@ public struct SuggestionInjector {
 
         // then check how many characters are not in the suffix of the suggestion.
         guard let splitIndex else { return 0 }
-        
-        let suffix = lastRemovedLineCleaned[splitIndex...]
+
+        var suffix = String(lastRemovedLineCleaned[splitIndex...])
         if last.hasSuffix(suffix) { return 0 }
 
+        // remove the first adjacent placeholder in suffix which looks like `<#Hello#>`
+
+        let regex = try! NSRegularExpression(pattern: "<#.*?#>")
+
+        if let firstPlaceholderRange = regex.firstMatch(
+            in: suffix,
+            options: [],
+            range: NSRange(suffix.startIndex..., in: suffix)
+        )?.range,
+            firstPlaceholderRange.location <= 1,
+            let r = Range(firstPlaceholderRange, in: suffix)
+        {
+            suffix.removeSubrange(r)
+        }
+
         let lastInsertingLine = toBeInserted[toBeInserted.endIndex - 1]
             .droppedLineBreak()
             .appending(suffix)

Core/Tests/SuggestionInjectorTests/AcceptSuggestionTests.swift

@@ -541,6 +541,40 @@ final class AcceptSuggestionTests: XCTestCase {
 
         """)
     }
+    
+    func test_remove_the_first_adjacent_placeholder_in_the_last_line(
+    ) async throws {
+        let content = """
+        apiKeyName: <#T##value: BinaryInteger##BinaryInteger#> <#Hello#>,
+        """
+
+        let suggestion = CodeSuggestion(
+            text: "apiKeyName: azureOpenAIAPIKeyName",
+            position: .init(line: 0, character: 12),
+            uuid: "",
+            range: .init(
+                start: .init(line: 0, character: 0),
+                end: .init(line: 0, character: 12)
+            ),
+            displayText: ""
+        )
+
+        var lines = content.breakIntoEditorStyleLines()
+        var extraInfo = SuggestionInjector.ExtraInfo()
+        var cursor = CursorPosition(line: 5, character: 34)
+        SuggestionInjector().acceptSuggestion(
+            intoContentWithoutSuggestion: &lines,
+            cursorPosition: &cursor,
+            completion: suggestion,
+            extraInfo: &extraInfo
+        )
+
+        XCTAssertEqual(cursor, .init(line: 0, character: 33))
+        XCTAssertEqual(lines.joined(separator: ""), """
+        apiKeyName: azureOpenAIAPIKeyName <#Hello#>,
+
+        """)
+    }
 }
 
 extension String {