Update to also remove trailing whitespaces

intitni · intitni · commit 04109d54ce46 · 2023-07-11T11:22:40.000+08:00
diff --git a/Core/Sources/GitHubCopilotService/GitHubCopilotService.swift b/Core/Sources/GitHubCopilotService/GitHubCopilotService.swift
@@ -316,7 +316,7 @@ public final class GitHubCopilotSuggestionService: GitHubCopilotBaseService,
                     if UserDefaults.shared.value(for: \.gitHubCopilotIgnoreTrailingNewLines) {
                         var updated = $0
                         var text = updated.text[...]
-                        while text.hasSuffix("\n") {
+                        while let last = text.last, last.isNewline || last.isWhitespace {
                             text = text.dropLast(1)
                         }
                         updated.text = String(text)
diff --git a/Core/Sources/HostApp/AccountSettings/CopilotView.swift b/Core/Sources/HostApp/AccountSettings/CopilotView.swift
@@ -231,7 +231,7 @@ struct CopilotView: View {
 
                 Form {
                     Toggle(
-                        "Ignore Trailing New Lines",
+                        "Ignore Trailing New Lines and Whitespaces",
                         isOn: $settings.gitHubCopilotIgnoreTrailingNewLines
                     )
                     Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public final class GitHubCopilotSuggestionService: GitHubCopilotBaseService,`
`316`	`316`	`if UserDefaults.shared.value(for: \.gitHubCopilotIgnoreTrailingNewLines) {`
`317`	`317`	`var updated = $0`
`318`	`318`	`var text = updated.text[...]`
`319`		`- while text.hasSuffix("\n") {`
	`319`	`+ while let last = text.last, last.isNewline \|\| last.isWhitespace {`
`320`	`320`	`text = text.dropLast(1)`
`321`	`321`	`}`
`322`	`322`	`updated.text = String(text)`
Original file line number	Diff line number	Diff line change
`@@ -231,7 +231,7 @@ struct CopilotView: View {`
`231`	`231`
`232`	`232`	`Form {`
`233`	`233`	`Toggle(`
`234`		`- "Ignore Trailing New Lines",`
	`234`	`+ "Ignore Trailing New Lines and Whitespaces",`
`235`	`235`	`isOn: $settings.gitHubCopilotIgnoreTrailingNewLines`
`236`	`236`	`)`
`237`	`237`	`Toggle("Verbose Log", isOn: $settings.gitHubCopilotVerboseLog)`