Fix HtmlAttributedStringConverter AttributedString to HTML conversion

Fix typo Add test
zotero · Aug 10, 2023 · a08838c · a08838c
1 parent a899997
commit a08838c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/Zotero/Controllers/HtmlAttributedStringConverter.swift b/Zotero/Controllers/HtmlAttributedStringConverter.swift
@@ -54,7 +54,7 @@ final class HtmlAttributedStringConverter {
     }
 
     /// Finds which attributes are currently opened (don't have closing attribute before them) in given array.
-    /// - parameter attributesL Attributes array to check.
+    /// - parameter attributes: Attributes array to check.
     /// - returns: Array of opened attributes.
     private func openedAttributes(from attributes: [Attribute]) -> [StringAttribute] {
         let allCount = StringAttribute.allCases.count
@@ -68,7 +68,8 @@ final class HtmlAttributedStringConverter {
                 opened.append(attribute.type)
             }
 
-            if (opened.count + closed.count) == allCount {
+            let uniqueAttributes: Set<StringAttribute> = .init(opened).union(closed)
+            if uniqueAttributes.count == allCount {
                 break
             }
         }

diff --git a/ZoteroTests/HtmlAttributedStringConverterSpec.swift b/ZoteroTests/HtmlAttributedStringConverterSpec.swift
@@ -166,6 +166,27 @@ final class HtmlAttributedStringConverterSpec: QuickSpec {
                 let string = htmlConverter.convert(attributedString: attributedString)
                 expect(string).to(equal(#"abc <b><i>def</i></b> ghi <span style="font-variant:small-caps;">jk<sup>l</sup></span> mno"#))
             }
+
+            it("converts multiple tags complex") {
+                let attributedStringRaw = #"start_bold_italic_subscript bold bold_superscript bold bold_subscript bold bold\nitalic\nend"#
+                let htmlStringRaw = #"<b><i><sub>start_bold_italic_subscript</sub></i> bold <sup>bold_superscript</sup> bold <sub>bold_subscript</sub> bold <i>bold\nitalic\nend</i></b>"#
+                let attributesAndRanges: [([StringAttribute], NSRange)] = [
+                    ([.bold, .italic, .subscript], NSRange(location: 0, length: 27)),
+                    ([.bold], NSRange(location: 27, length: 6)),
+                    ([.bold, .superscript], NSRange(location: 33, length: 16)),
+                    ([.bold], NSRange(location: 49, length: 6)),
+                    ([.bold, .subscript], NSRange(location: 55, length: 14)),
+                    ([.bold], NSRange(location: 69, length: 6)),
+                    ([.bold, .italic], NSRange(location: 75, length: 17))
+                ]
+                let attributedString = NSMutableAttributedString(string: attributedStringRaw, attributes: [.font: font])
+                expect(attributedString.length).to(equal(attributedStringRaw.count))
+                for (attributes, range) in attributesAndRanges {
+                    attributedString.addAttributes(StringAttribute.nsStringAttributes(from: attributes, baseFont: font), range: range)
+                }
+                let string = htmlConverter.convert(attributedString: attributedString)
+                expect(string).to(equal(htmlStringRaw))
+            }
         }
     }
 }