ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-02 21:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve the blank lines typed after a list

Browse Source 
The newline to break replacement only matched paragraph to paragraph, so a blank
line after a list was dropped and the text following it glued to the last item.
Only a following paragraph is matched, because without a blank line its text
would have continued the last item instead of starting a paragraph of its own.
This commit is contained in:
Stefan Ceriu
2026-08-21 17:18:19 +03:00
parent 8ead25eaa3
commit 925e61e40c
3 changed files with 51 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Other/Extensions/String.swift
+5 -3
View File
@@ -52,9 +52,10 @@ nonisolated extension String {
}
nonisolated extension String {
/// Drops stray new lines everywhere but paragraphs and lists when other paragraphs follow them
func replacingHtmlBreaksOccurrences() -> String {
var result = self
let pattern = #"</p>(\n+)<p>"#
let pattern = #"</(p|ul|ol)>(\n+)(?=<p[ >])"#
guard let regex = try? NSRegularExpression(pattern: pattern, options: []) else {
return result
@@ -63,11 +64,12 @@ nonisolated extension String {
for match in matches.reversed() {
guard let range = Range(match.range, in: self),
let innerMatchRange = Range(match.range(at: 1), in: self) else {
let tagRange = Range(match.range(at: 1), in: self),
let innerMatchRange = Range(match.range(at: 2), in: self) else {
continue
}
let numberOfBreaks = (self[innerMatchRange].components(separatedBy: "\n").count - 1)
let replacement = "<br>" + String(repeating: "<br>", count: numberOfBreaks)
let replacement = "</\(self[tagRange])>" + String(repeating: "<br>", count: numberOfBreaks)
result.replaceSubrange(range, with: replacement)
}