Fix FetchSuggestionTests

Author: intitni

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/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
     }