Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

fix(engine): The selected-text preview reads only the 60 characters it reports

moppeeer31d235013f0b
diff --git a/crates/engine/src/cmd/text.rs b/crates/engine/src/cmd/text.rs
index 1e3272fe3..334dfad03 100644
--- a/crates/engine/src/cmd/text.rs
+++ b/crates/engine/src/cmd/text.rs
@@ -973,6 +973,14 @@ fn open_type(s: &mut Session, p: &Value) -> Result<Value> {
/// How much of the selected text `type.selectionAttrs` reports.
const SELECTED_TEXT_CHARS: usize = 60;
+fn selected_text_preview(chars: impl Iterator<Item = char>) -> String {
+ chars
+ .map(|c| if c.is_control() || c == designcraft_doc::OBJECT_MARK { ' ' } else { c })
+ .skip_while(|c| c.is_whitespace())
+ .take(SELECTED_TEXT_CHARS)
+ .collect()
+}
+
fn selection_attrs(s: &mut Session, _p: &Value) -> Result<Value> {
let st = s.doc()?;
let targets = format_targets(s);
@@ -984,14 +992,7 @@ fn selection_attrs(s: &mut Session, _p: &Value) -> Result<Value> {
let cf = if r.is_empty() { story.char_format_at(r.start) } else { story.format_after(r.start) };
let cp = st.doc.styles.resolve_char(&base, cf);
// The selected text (its start, on one line), for previews such as the font menu's.
- let line: String = story
- .text
- .get(r.start..r.end)
- .unwrap_or_default()
- .chars()
- .map(|c| if c.is_control() || c == designcraft_doc::OBJECT_MARK { ' ' } else { c })
- .collect();
- let selected: String = line.trim_start().chars().take(SELECTED_TEXT_CHARS).collect();
+ let selected = selected_text_preview(story.text.get(r.start..r.end).unwrap_or_default().chars());
Ok(json!({"story": sid.0, "paragraphStyle": pf.style, "characterStyle": cf.style, "para": pp, "chars": cp,
"paraOverrides": pf.para.count(), "charOverrides": cf.over.count(), "selectedText": selected.trim()}))
}
@@ -1166,6 +1167,17 @@ mod open_type_tests {
s.execute("text.move", &json!({"dir": "right"})).unwrap();
}
+ #[test]
+ fn selected_text_preview_stops_at_its_character_budget() {
+ let read = std::cell::Cell::new(0usize);
+ let prefix = ['\t', '\u{2003}', designcraft_doc::OBJECT_MARK];
+ let chars = prefix.into_iter().chain(std::iter::repeat_n('字', 100_000)).inspect(|_| read.set(read.get() + 1));
+ let preview = super::selected_text_preview(chars);
+ assert_eq!(preview, "字".repeat(super::SELECTED_TEXT_CHARS));
+ assert_eq!(read.get(), prefix.len() + super::SELECTED_TEXT_CHARS, "the rest of a large selection is never copied or scanned");
+ assert_eq!(super::selected_text_preview("A\nB".chars()), "A B");
+ }
+
#[test]
fn selection_attrs_report_the_selected_text() {
let mut s = Session::new();