add_newline unimpaired mapping (#653)

* added some keymaps

* remove

* remove wrong mappings

* remove

* wrong import

* use enum

* correct line ending

* added to book

* column
pull/666/head^2
oberblastmeister 3 years ago committed by GitHub
parent ae3f936611
commit 825bceeab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -110,10 +110,9 @@ in reverse, or searching via smartcase.
| `N` | Add next search match to selection | `extend_search_next` | | `N` | Add next search match to selection | `extend_search_next` |
| `*` | Use current selection as the search pattern | `search_selection` | | `*` | Use current selection as the search pattern | `search_selection` |
### Diagnostics ### Unimpaired
> NOTE: `[` and `]` will likely contain more pair mappings in the style of Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired)
> [vim-unimpaired](https://github.com/tpope/vim-unimpaired)
| Key | Description | Command | | Key | Description | Command |
| ----- | ----------- | ------- | | ----- | ----------- | ------- |
@ -121,6 +120,8 @@ in reverse, or searching via smartcase.
| `]d` | Go to next diagnostic | `goto_next_diag` | | `]d` | Go to next diagnostic | `goto_next_diag` |
| `[D` | Go to first diagnostic in document | `goto_first_diag` | | `[D` | Go to first diagnostic in document | `goto_first_diag` |
| `]D` | Go to last diagnostic in document | `goto_last_diag` | | `]D` | Go to last diagnostic in document | `goto_last_diag` |
| `[space` | Add newline above | `add_newline_above` |
| `]space` | Add newline below | `add_newline_below` |
### Shell ### Shell

@ -227,6 +227,8 @@ impl Command {
select_mode, "Enter selection extend mode", select_mode, "Enter selection extend mode",
exit_select_mode, "Exit selection mode", exit_select_mode, "Exit selection mode",
goto_definition, "Goto definition", goto_definition, "Goto definition",
add_newline_above, "Add newline above",
add_newline_below, "Add newline below",
goto_type_definition, "Goto type definition", goto_type_definition, "Goto type definition",
goto_implementation, "Goto implementation", goto_implementation, "Goto implementation",
goto_file_start, "Goto file start/line", goto_file_start, "Goto file start/line",
@ -4473,3 +4475,37 @@ fn suspend(_cx: &mut Context) {
#[cfg(not(windows))] #[cfg(not(windows))]
signal_hook::low_level::raise(signal_hook::consts::signal::SIGTSTP).unwrap(); signal_hook::low_level::raise(signal_hook::consts::signal::SIGTSTP).unwrap();
} }
fn add_newline_above(cx: &mut Context) {
add_newline_impl(cx, Open::Above);
}
fn add_newline_below(cx: &mut Context) {
add_newline_impl(cx, Open::Below)
}
fn add_newline_impl(cx: &mut Context, open: Open) {
let count = cx.count();
let (view, doc) = current!(cx.editor);
let selection = doc.selection(view.id);
let text = doc.text();
let slice = text.slice(..);
let changes = selection.into_iter().map(|range| {
let (start, end) = range.line_range(slice);
let line = match open {
Open::Above => start,
Open::Below => end + 1,
};
let pos = text.line_to_char(line);
(
pos,
pos,
Some(doc.line_ending.as_str().repeat(count).into()),
)
});
let transaction = Transaction::change(text, changes);
doc.apply(&transaction, view.id);
doc.append_changes_to_history(view.id);
}

@ -412,10 +412,12 @@ impl Default for Keymaps {
"[" => { "Left bracket" "[" => { "Left bracket"
"d" => goto_prev_diag, "d" => goto_prev_diag,
"D" => goto_first_diag, "D" => goto_first_diag,
"space" => add_newline_above,
}, },
"]" => { "Right bracket" "]" => { "Right bracket"
"d" => goto_next_diag, "d" => goto_next_diag,
"D" => goto_last_diag, "D" => goto_last_diag,
"space" => add_newline_below,
}, },
"/" => search, "/" => search,

Loading…
Cancel
Save