Update change-case commands to work with gap indexing.
This commit is contained in:
parent
a77274e8bb
commit
954314a7c9
1 changed files with 36 additions and 27 deletions
|
@ -786,24 +786,27 @@ fn replace(cx: &mut Context) {
|
|||
|
||||
fn switch_case(cx: &mut Context) {
|
||||
let (view, doc) = current!(cx.editor);
|
||||
let transaction =
|
||||
Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
|
||||
let text: Tendril = range
|
||||
.fragment(doc.text().slice(..))
|
||||
.chars()
|
||||
.flat_map(|ch| {
|
||||
if ch.is_lowercase() {
|
||||
ch.to_uppercase().collect()
|
||||
} else if ch.is_uppercase() {
|
||||
ch.to_lowercase().collect()
|
||||
} else {
|
||||
vec![ch]
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
let selection = doc
|
||||
.selection(view.id)
|
||||
.clone()
|
||||
.min_width_1(doc.text().slice(..));
|
||||
let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| {
|
||||
let text: Tendril = range
|
||||
.fragment(doc.text().slice(..))
|
||||
.chars()
|
||||
.flat_map(|ch| {
|
||||
if ch.is_lowercase() {
|
||||
ch.to_uppercase().collect()
|
||||
} else if ch.is_uppercase() {
|
||||
ch.to_lowercase().collect()
|
||||
} else {
|
||||
vec![ch]
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
|
||||
(range.from(), range.to() + 1, Some(text))
|
||||
});
|
||||
(range.from(), range.to(), Some(text))
|
||||
});
|
||||
|
||||
doc.apply(&transaction, view.id);
|
||||
doc.append_changes_to_history(view.id);
|
||||
|
@ -811,12 +814,15 @@ fn switch_case(cx: &mut Context) {
|
|||
|
||||
fn switch_to_uppercase(cx: &mut Context) {
|
||||
let (view, doc) = current!(cx.editor);
|
||||
let transaction =
|
||||
Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
|
||||
let text: Tendril = range.fragment(doc.text().slice(..)).to_uppercase().into();
|
||||
let selection = doc
|
||||
.selection(view.id)
|
||||
.clone()
|
||||
.min_width_1(doc.text().slice(..));
|
||||
let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| {
|
||||
let text: Tendril = range.fragment(doc.text().slice(..)).to_uppercase().into();
|
||||
|
||||
(range.from(), range.to() + 1, Some(text))
|
||||
});
|
||||
(range.from(), range.to(), Some(text))
|
||||
});
|
||||
|
||||
doc.apply(&transaction, view.id);
|
||||
doc.append_changes_to_history(view.id);
|
||||
|
@ -824,12 +830,15 @@ fn switch_to_uppercase(cx: &mut Context) {
|
|||
|
||||
fn switch_to_lowercase(cx: &mut Context) {
|
||||
let (view, doc) = current!(cx.editor);
|
||||
let transaction =
|
||||
Transaction::change_by_selection(doc.text(), doc.selection(view.id), |range| {
|
||||
let text: Tendril = range.fragment(doc.text().slice(..)).to_lowercase().into();
|
||||
let selection = doc
|
||||
.selection(view.id)
|
||||
.clone()
|
||||
.min_width_1(doc.text().slice(..));
|
||||
let transaction = Transaction::change_by_selection(doc.text(), &selection, |range| {
|
||||
let text: Tendril = range.fragment(doc.text().slice(..)).to_lowercase().into();
|
||||
|
||||
(range.from(), range.to() + 1, Some(text))
|
||||
});
|
||||
(range.from(), range.to(), Some(text))
|
||||
});
|
||||
|
||||
doc.apply(&transaction, view.id);
|
||||
doc.append_changes_to_history(view.id);
|
||||
|
|
Loading…
Reference in a new issue