aleleba/wordcraft
1
0
Fork 0
mirror of https://github.com/storytold/wordcraft.git synced 2026-11-11 16:31:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(smart_art): normalize layout and color identifiers and preserve item text with leading whitespace (#2365)

Browse Source 
* fix(smart_art): normalize layout and color identifiers and preserve item text with leading whitespace

* Use Iterator::find (clippy manual_find)

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Brandon Thomas <echelon@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
divyanshu2074
2026-10-18 04:45:17 -04:00
committed by GitHub
co-authored by Claude Opus 5.5 Brandon Thomas
parent 341f370368
commit 2db55b5498
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/doc/src/smart_art.rs
+17 -7
View File
@@ -68,13 +68,14 @@ impl SmartArtLayout {
}
}
/// The layout an id names (any ASCII case; `list` is the basic list).
/// The layout an id names (any ASCII case, ignoring hyphens, underscores and spaces;
/// `list` is the basic list; `basic process` or `process` is process, etc.).
pub fn from_id(id: &str) -> Option<SmartArtLayout> {
let id = id.trim();
if id.eq_ignore_ascii_case("list") {
let norm = id.chars().filter(|c| !c.is_whitespace() && *c != '-' && *c != '_').collect::<String>();
if norm.eq_ignore_ascii_case("list") {
return Some(SmartArtLayout::BasicList);
}
SmartArtLayout::ALL.into_iter().find(|l| l.id().eq_ignore_ascii_case(id))
SmartArtLayout::ALL.into_iter().find(|l| l.id().eq_ignore_ascii_case(&norm) || l.label().replace(' ', "").eq_ignore_ascii_case(&norm))
}
/// The name shown for it.
@@ -159,7 +160,8 @@ impl SmartArtColors {
}
pub fn from_id(id: &str) -> Option<SmartArtColors> {
SmartArtColors::ALL.into_iter().find(|c| c.id().eq_ignore_ascii_case(id.trim()))
let norm = id.chars().filter(|c| !c.is_whitespace() && *c != '-' && *c != '_').collect::<String>();
SmartArtColors::ALL.into_iter().find(|c| c.id().eq_ignore_ascii_case(&norm) || c.label().replace(' ', "").eq_ignore_ascii_case(&norm))
}
/// The name shown for it.
@@ -287,8 +289,9 @@ impl SmartArtSpec {
/// `s` as item text: control characters as spaces, ends trimmed, at most [`MAX_TEXT`] characters.
pub fn clean_text(s: &str) -> String {
let s: String = s.chars().take(MAX_TEXT * 4).map(|c| if c.is_control() { ' ' } else { c }).collect();
s.trim().chars().take(MAX_TEXT).collect::<String>().trim_end().to_string()
let trimmed = s.trim_start_matches(|c: char| c.is_whitespace() || c.is_control());
let s: String = trimmed.chars().take(MAX_TEXT).map(|c| if c.is_control() { ' ' } else { c }).collect();
s.trim_end().to_string()
}
#[cfg(test)]
@@ -319,6 +322,13 @@ mod tests {
assert_eq!(s.descendants(5), 6..6);
assert_eq!(s.descendants(99), 0..0);
assert_eq!(SmartArtLayout::from_id("VENN"), Some(SmartArtLayout::Venn));
assert_eq!(SmartArtLayout::from_id("basic-list"), Some(SmartArtLayout::BasicList));
assert_eq!(SmartArtLayout::from_id("Basic Process"), Some(SmartArtLayout::Process));
assert_eq!(SmartArtLayout::from_id("basic_cycle"), Some(SmartArtLayout::Cycle));
assert_eq!(SmartArtLayout::from_id("list"), Some(SmartArtLayout::BasicList));
assert_eq!(SmartArtColors::from_id("colorful"), Some(SmartArtColors::Colorful));
assert_eq!(SmartArtColors::from_id("Accent 2"), Some(SmartArtColors::Accent2));
assert_eq!(SmartArtColors::from_id("accent-4"), Some(SmartArtColors::Accent4));
assert_eq!(clean_text(&format!("{}Valid Text", " ".repeat(1500))), "Valid Text");
}
}