Remove toggle

Author: intitni

Core/Sources/HostApp/AccountSettings/GitHubCopilotView.swift

@@ -20,8 +20,6 @@ struct GitHubCopilotView: View {
         @AppStorage(\.gitHubCopilotProxyPassword) var gitHubCopilotProxyPassword
         @AppStorage(\.gitHubCopilotUseStrictSSL) var gitHubCopilotUseStrictSSL
         @AppStorage(\.gitHubCopilotEnterpriseURI) var gitHubCopilotEnterpriseURI
-        @AppStorage(\.gitHubCopilotIgnoreTrailingNewLines)
-        var gitHubCopilotIgnoreTrailingNewLines
         @AppStorage(\.disableGitHubCopilotSettingsAutoRefreshOnAppear)
         var disableGitHubCopilotSettingsAutoRefreshOnAppear
         init() {}
@@ -267,17 +265,6 @@ struct GitHubCopilotView: View {
                 SettingsDivider("Advanced")
 
                 Form {
-                    Toggle(
-                        "Remove Extra New Lines Generated by GitHub Copilot",
-                        isOn: $settings.gitHubCopilotIgnoreTrailingNewLines
-                    )
-                    Text(
-                        "Sometimes GitHub Copilot may generate extra unwanted new lines at the end of a suggestion. If you don't like that, you can turn this toggle on."
-                    )
-                    .lineLimit(10)
-                    .foregroundColor(.secondary)
-                    .font(.callout)
-                    .dynamicHeightTextInFormWorkaround()
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)
                 }
 

Tool/Sources/Preferences/Keys.swift

@@ -187,10 +187,6 @@ public extension UserDefaultPreferenceKeys {
     var runNodeWith: PreferenceKey<NodeRunner> {
         .init(defaultValue: .env, key: "RunNodeWith")
     }
-
-    var gitHubCopilotIgnoreTrailingNewLines: PreferenceKey<Bool> {
-        .init(defaultValue: true, key: "GitHubCopilotIgnoreTrailingNewLines")
-    }
 }
 
 // MARK: - Codeium Settings

Tool/Sources/SuggestionProvider/PostProcessingSuggestionServiceMiddleware.swift

@@ -10,20 +10,28 @@ public struct PostProcessingSuggestionServiceMiddleware: SuggestionServiceMiddle
         next: Next
     ) async throws -> [CodeSuggestion] {
         let suggestions = try await next(request)
-        
+
         return suggestions.compactMap {
             var suggestion = $0
             Self.removeTrailingWhitespacesAndNewlines(&suggestion)
             if suggestion.text.isEmpty { return nil }
             return suggestion
         }
     }
-    
+
     static func removeTrailingWhitespacesAndNewlines(_ suggestion: inout CodeSuggestion) {
         var text = suggestion.text[...]
         while let last = text.last, last.isNewline || last.isWhitespace {
             text = text.dropLast(1)
         }
         suggestion.text = String(text)
     }
+
+    static func checkIfSuggestionHasNoEffect(
+        _ suggestion: CodeSuggestion,
+        request: SuggestionRequest
+    ) -> Bool {
+        suggestion.text.isEmpty
+    }
 }
+