@@ -272,6 +272,7 @@ impl Command {
272272 // TODO: different description ?
273273 goto_line_end_newline, "Goto line end",
274274 goto_first_nonwhitespace, "Goto first non-blank in line",
275+ trim_selections, "Trim whitespace from selections",
275276 extend_to_line_start, "Extend to line start",
276277 extend_to_line_end, "Extend to line end",
277278 extend_to_line_end_newline, "Extend to line end",
@@ -584,6 +585,42 @@ fn goto_first_nonwhitespace(cx: &mut Context) {
584585 doc.set_selection(view.id, selection);
585586}
586587
588+fn trim_selections(cx: &mut Context) {
589+ let (view, doc) = current!(cx.editor);
590+ let text = doc.text().slice(..);
591+
592+ let ranges: SmallVec<[Range; 1]> = doc
593+ .selection(view.id)
594+ .iter()
595+ .filter_map(|range| {
596+ if range.is_empty() || range.fragment(text).chars().all(|ch| ch.is_whitespace()) {
597+ return None;
598+ }
599+ let mut start = range.from();
600+ let mut end = range.to();
601+ start = movement::skip_while(text, start, |x| x.is_whitespace()).unwrap_or(start);
602+ end = movement::backwards_skip_while(text, end, |x| x.is_whitespace()).unwrap_or(end);
603+ if range.anchor < range.head {
604+ Some(Range::new(start, end))
605+ } else {
606+ Some(Range::new(end, start))
607+ }
608+ })
609+ .collect();
610+
611+ if !ranges.is_empty() {
612+ let primary = doc.selection(view.id).primary();
613+ let idx = ranges
614+ .iter()
615+ .position(|range| range.overlaps(&primary))
616+ .unwrap_or(ranges.len() - 1);
617+ doc.set_selection(view.id, Selection::new(ranges, idx));
618+ } else {
619+ collapse_selection(cx);
620+ keep_primary_selection(cx);
621+ };
622+}
623+
587624fn goto_window(cx: &mut Context, align: Align) {
588625 let (view, doc) = current!(cx.editor);
589626