Reduce style chain bloat

3 files changed, 23 insertions, 6 deletions

diff --git a/src/model/content.rs b/src/model/content.rs
index bc25cd79..3851d38d 100644
--- a/src/model/content.rs
+++ b/src/model/content.rs
@@ -115,10 +115,14 @@ impl Content {
     pub fn styled_with_entry(mut self, entry: StyleEntry) -> Self {
         if let Some(styled) = self.try_downcast_mut::<StyledNode>() {
             styled.map.apply(entry);
-            return self;
+            self
+        } else if let Some(styled) = self.downcast::<StyledNode>() {
+            let mut map = styled.map.clone();
+            map.apply(entry);
+            StyledNode { sub: styled.sub.clone(), map }.pack()
+        } else {
+            StyledNode { sub: self, map: entry.into() }.pack()
         }
-
-        StyledNode { sub: self, map: entry.into() }.pack()
     }
 
     /// Style this content with a full style map.
diff --git a/src/model/styles.rs b/src/model/styles.rs
index 8e731942..62e3188f 100644
--- a/src/model/styles.rs
+++ b/src/model/styles.rs
@@ -85,6 +85,15 @@ impl StyleMap {
     /// Like [`chain`](Self::chain) or [`apply_map`](Self::apply_map), but with
     /// only a entry.
     pub fn apply(&mut self, entry: StyleEntry) {
+        if let StyleEntry::Guard(a) = &entry {
+            if let [StyleEntry::Unguard(b), ..] = self.0.as_slice() {
+                if a == b {
+                    self.0.remove(0);
+                    return;
+                }
+            }
+        }
+
         self.0.insert(0, entry);
     }
 
@@ -124,7 +133,7 @@ impl From<StyleEntry> for StyleMap {
 
 impl Debug for StyleMap {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        for entry in self.0.iter().rev() {
+        for entry in self.0.iter() {
             writeln!(f, "{:?}", entry)?;
         }
         Ok(())
@@ -351,7 +360,7 @@ impl<'a> StyleChain<'a> {
 
 impl Debug for StyleChain<'_> {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        for entry in self.entries() {
+        for entry in self.entries().collect::<Vec<_>>().into_iter().rev() {
             writeln!(f, "{:?}", entry)?;
         }
         Ok(())
diff --git a/src/util/mod.rs b/src/util/mod.rs
index c6809d23..0b681223 100644
--- a/src/util/mod.rs
+++ b/src/util/mod.rs
@@ -161,9 +161,13 @@ impl ReadableTypeId {
 impl Debug for ReadableTypeId {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
         #[cfg(debug_assertions)]
-        f.pad(self.name)?;
+        if let Some(part) = self.name.split("::").last() {
+            f.pad(part)?;
+        }
+
         #[cfg(not(debug_assertions))]
         f.pad("ReadableTypeId")?;
+
         Ok(())
     }
 }