From bdd5796a10bc5e7c08f2fae6a2f904d36959edec Mon Sep 17 00:00:00 2001
From: Nate Weaver <wevah@derailer.org>
Date: Sun, 26 Apr 2020 11:11:26 -0500
Subject: [PATCH] Use a custom CountedSet for styles so nested tags work

---
 .../NSAttributedString+NetNewsWire.swift      | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/Shared/Extensions/NSAttributedString+NetNewsWire.swift b/Shared/Extensions/NSAttributedString+NetNewsWire.swift
index e417cb9ee..2934fa0e2 100644
--- a/Shared/Extensions/NSAttributedString+NetNewsWire.swift
+++ b/Shared/Extensions/NSAttributedString+NetNewsWire.swift
@@ -176,13 +176,13 @@ extension NSAttributedString {
 		var inTag: InTag = .none
 		var tagBuf = ""
 		var tagStack = [String]()
-		var currentStyles: Set<Style> = []
+		var currentStyles = CountedSet<Style>()
 
 		var iterator = html.makeIterator()
 
 		let result = NSMutableAttributedString()
 
-		var attributeRanges = [(range: NSRange, styles: Set<Style>)]()
+		var attributeRanges = [ (range: NSRange, styles: CountedSet<Style>) ]()
 
 		while let char = iterator.next() {
 			if char == "<" && inTag == .none {
@@ -329,3 +329,34 @@ extension NSAttributedString {
 	}
 
 }
+
+/// This is a very, very basic implementation that only covers our needs.
+struct CountedSet<Element> where Element: Hashable {
+	private var _storage = [Element: Int]()
+
+	mutating func insert(_ element: Element) {
+		_storage[element, default: 0] += 1
+	}
+
+	mutating func remove(_ element: Element) {
+		guard var count = _storage[element] else { return }
+
+		count -= 1
+
+		if count == 0 {
+			_storage.removeValue(forKey: element)
+		} else {
+			_storage[element] = count
+		}
+	}
+
+	func contains(_ element: Element) -> Bool {
+		return _storage[element] != nil
+	}
+
+	subscript(key: Element) -> Int? {
+		get {
+			return _storage[key]
+		}
+	}
+}