Skip to content

Commit

Permalink
Join empty lines with only one space in join_selections (helix-edit…
Browse files Browse the repository at this point in the history
…or#8989)

* fix: helix-editor#8977

fixes the issue that lines with only spaces are getting
joined as well

* reverting some renamings

* improve empty line check

* adding integration test

* reverting code block

* fix conditon check for line end

* applying suggested style
  • Loading branch information
TornaxO7 authored and mtoohey31 committed Jun 2, 2024
1 parent 130c43f commit 2e5ecea
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 10 deletions.
20 changes: 10 additions & 10 deletions helix-term/src/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4391,10 +4391,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
use movement::skip_while;
let (view, doc) = current!(cx.editor);
let text = doc.text();
let slice = doc.text().slice(..);
let slice = text.slice(..);

let mut changes = Vec::new();
let fragment = Tendril::from(" ");

for selection in doc.selection(view.id) {
let (start, mut end) = selection.line_range(slice);
Expand All @@ -4410,9 +4409,13 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
let mut end = text.line_to_char(line + 1);
end = skip_while(slice, end, |ch| matches!(ch, ' ' | '\t')).unwrap_or(end);

// need to skip from start, not end
let change = (start, end, Some(fragment.clone()));
changes.push(change);
let separator = if end == line_end_char_index(&slice, line + 1) {
// the joining line contains only space-characters => don't include a whitespace when joining
None
} else {
Some(Tendril::from(" "))
};
changes.push((start, end, separator));
}
}

Expand All @@ -4424,9 +4427,6 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
changes.sort_unstable_by_key(|(from, _to, _text)| *from);
changes.dedup();

// TODO: joining multiple empty lines should be replaced by a single space.
// need to merge change ranges that touch

// select inserted spaces
let transaction = if select_space {
let ranges: SmallVec<_> = changes
Expand All @@ -4438,9 +4438,9 @@ fn join_selections_impl(cx: &mut Context, select_space: bool) {
})
.collect();
let selection = Selection::new(ranges, 0);
Transaction::change(doc.text(), changes.into_iter()).with_selection(selection)
Transaction::change(text, changes.into_iter()).with_selection(selection)
} else {
Transaction::change(doc.text(), changes.into_iter())
Transaction::change(text, changes.into_iter())
};

doc.apply(&transaction, view.id);
Expand Down
46 changes: 46 additions & 0 deletions helix-term/tests/test/commands.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,3 +480,49 @@ fn bar() {#(\n|)#\

Ok(())
}

#[tokio::test(flavor = "multi_thread")]
async fn test_join_selections() -> anyhow::Result<()> {
// normal join
test((
platform_line(indoc! {"\
#[a|]#bc
def
"}),
"J",
platform_line(indoc! {"\
#[a|]#bc def
"}),
))
.await?;

// join with empty line
test((
platform_line(indoc! {"\
#[a|]#bc
def
"}),
"JJ",
platform_line(indoc! {"\
#[a|]#bc def
"}),
))
.await?;

// join with additional space in non-empty line
test((
platform_line(indoc! {"\
#[a|]#bc
def
"}),
"JJ",
platform_line(indoc! {"\
#[a|]#bc def
"}),
))
.await?;

Ok(())
}

0 comments on commit 2e5ecea

Please sign in to comment.