write! for RichTextBuilder (#1596)

* write! for RichTextBuilder * panic on formatting error * Fix doc test * Make write_fmt doc hidden Co-authored-by: Colin Rofls <[email protected]>
linebender · Feb 17, 2021 · b9070eb · b9070eb
1 parent f5fd4b0
commit b9070eb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ You can find its changes [documented below](#070---2021-01-01).
 ### Highlights
 
 ### Added
+- `write!` for `RichTextBuilder` ([#1596] by [@Maan2003])
 - Sub windows: Allow opening windows that share state with arbitrary parts of the widget hierarchy ([#1254] by [@rjwittams])
 - WindowCloseRequested/WindowDisconnected event when a window is closing ([#1254] by [@rjwittams])
 - RichTextBuilder ([#1520] by [@Maan2003])
@@ -617,6 +618,7 @@ Last release without a changelog :(
 [#1559]: https://github.com/linebender/druid/pull/1559
 [#1562]: https://github.com/linebender/druid/pull/1562
 [#1592]: https://github.com/linebender/druid/pull/1592
+[#1596]: https://github.com/linebender/druid/pull/1596
 
 [Unreleased]: https://github.com/linebender/druid/compare/v0.6.0...master
 [0.6.0]: https://github.com/linebender/druid/compare/v0.5.0...v0.6.0

diff --git a/druid/src/text/rich_text.rs b/druid/src/text/rich_text.rs
@@ -101,10 +101,14 @@ impl TextStorage for RichText {
 /// # Example
 /// ```
 /// # use druid::text::{Attribute, RichTextBuilder};
-/// # use druid::FontWeight;
+/// # use druid::{FontWeight, Color};
 /// let mut builder = RichTextBuilder::new();
 /// builder.push("Hello ");
 /// builder.push("World!").weight(FontWeight::BOLD);
+///
+/// // Can also use write!
+/// write!(builder, "Here is your number: {}", 1).underline(true).text_color(Color::RED);
+///
 /// let rich_text = builder.build();
 /// ```
 ///
@@ -131,6 +135,18 @@ impl RichTextBuilder {
         self.add_attributes_for_range(range)
     }
 
+    /// Glue for usage of the write! macro.
+    ///
+    /// This method should generally not be invoked manually, but rather through the write! macro itself.
+    #[doc(hidden)]
+    pub fn write_fmt(&mut self, fmt: std::fmt::Arguments<'_>) -> AttributesAdder {
+        use std::fmt::Write;
+        let start = self.buffer.len();
+        self.buffer
+            .write_fmt(fmt)
+            .expect("a formatting trait implementation returned an error");
+        self.add_attributes_for_range(start..self.buffer.len())
+    }
     /// Get an [`AttributesAdder`] for the given range.
     ///
     /// This can be used to modify styles for a given range after it has been added.