Skip to content

Commit

Permalink
Add new command to cycle through version control conflict markers
Browse files Browse the repository at this point in the history 
Issue: helix-editor#4647
  • Loading branch information
wes adams committed Nov 11, 2022
1 parent d7be546 commit 3e6a7c8
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 20 deletions.
42 changes: 22 additions & 20 deletions book/src/keymap.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,26 +302,28 @@ Displays documentation for item under cursor.

Mappings in the style of [vim-unimpaired](https://github.com/tpope/vim-unimpaired).

| Key | Description | Command |
| ----- | ----------- | ------- |
| `[d` | Go to previous diagnostic (**LSP**) | `goto_prev_diag` |
| `]d` | Go to next diagnostic (**LSP**) | `goto_next_diag` |
| `[D` | Go to first diagnostic in document (**LSP**) | `goto_first_diag` |
| `]D` | Go to last diagnostic in document (**LSP**) | `goto_last_diag` |
| `]f` | Go to next function (**TS**) | `goto_next_function` |
| `[f` | Go to previous function (**TS**) | `goto_prev_function` |
| `]c` | Go to next class (**TS**) | `goto_next_class` |
| `[c` | Go to previous class (**TS**) | `goto_prev_class` |
| `]a` | Go to next argument/parameter (**TS**) | `goto_next_parameter` |
| `[a` | Go to previous argument/parameter (**TS**) | `goto_prev_parameter` |
| `]o` | Go to next comment (**TS**) | `goto_next_comment` |
| `[o` | Go to previous comment (**TS**) | `goto_prev_comment` |
| `]t` | Go to next test (**TS**) | `goto_next_test` |
| `]t` | Go to previous test (**TS**) | `goto_prev_test` |
| `]p` | Go to next paragraph | `goto_next_paragraph` |
| `[p` | Go to previous paragraph | `goto_prev_paragraph` |
| `[Space` | Add newline above | `add_newline_above` |
| `]Space` | Add newline below | `add_newline_below` |
| Key | Description | Command |
| ----- | ----------- | ------- |
| `[d` | Go to previous diagnostic (**LSP**) | `goto_prev_diag` |
| `]d` | Go to next diagnostic (**LSP**) | `goto_next_diag` |
| `[D` | Go to first diagnostic in document (**LSP**) | `goto_first_diag` |
| `]D` | Go to last diagnostic in document (**LSP**) | `goto_last_diag` |
| `]f` | Go to next function (**TS**) | `goto_next_function` |
| `[f` | Go to previous function (**TS**) | `goto_prev_function` |
| `]c` | Go to next class (**TS**) | `goto_next_class` |
| `[c` | Go to previous class (**TS**) | `goto_prev_class` |
| `]a` | Go to next argument/parameter (**TS**) | `goto_next_parameter` |
| `[a` | Go to previous argument/parameter (**TS**) | `goto_prev_parameter` |
| `]o` | Go to next comment (**TS**) | `goto_next_comment` |
| `[o` | Go to previous comment (**TS**) | `goto_prev_comment` |
| `]t` | Go to next test (**TS**) | `goto_next_test` |
| `]t` | Go to previous test (**TS**) | `goto_prev_test` |
| `]p` | Go to next paragraph | `goto_next_paragraph` |
| `[p` | Go to previous paragraph | `goto_prev_paragraph` |
| `]n` | Go to next source control conflict marker | `goto_next_conflict_marker` |
| `[n` | Go to previous source control conflict marker| `goto_prev_conflict_marker` |
| `[Space` | Add newline above | `add_newline_above` |
| `]Space` | Add newline below | `add_newline_below` |

## Insert mode

Expand Down
29 changes: 29 additions & 0 deletions helix-term/src/commands.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,8 @@ impl MappableCommand {
goto_prev_test, "Goto previous test",
goto_next_paragraph, "Goto next paragraph",
goto_prev_paragraph, "Goto previous paragraph",
goto_next_conflict_marker, "Goto next conflict marker",
goto_prev_conflict_marker, "Goto prev conflict marker",
dap_launch, "Launch debug target",
dap_toggle_breakpoint, "Toggle breakpoint",
dap_continue, "Continue program execution",
Expand Down Expand Up @@ -984,6 +986,33 @@ fn goto_next_paragraph(cx: &mut Context) {
goto_para_impl(cx, movement::move_next_paragraph)
}

fn goto_conflict_marker(cx: &mut Context, movement: Movement, direction: Direction) {
let (_, doc) = current!(cx.editor);
let contents = doc.text().slice(..).to_string();
let re = Regex::new("<<<<<<<|=======|>>>>>>>").unwrap();
let config = cx.editor.config();
let scrolloff = config.scrolloff;
let wrap_around = config.search.wrap_around;
search_impl(
cx.editor,
&contents,
&re,
movement,
direction,
scrolloff,
wrap_around,
false,
);
}

fn goto_next_conflict_marker(cx: &mut Context) {
goto_conflict_marker(cx, Movement::Move, Direction::Forward)
}

fn goto_prev_conflict_marker(cx: &mut Context) {
goto_conflict_marker(cx, Movement::Move, Direction::Backward)
}

fn goto_file_start(cx: &mut Context) {
if cx.count.is_some() {
goto_line(cx);
Expand Down
2 changes: 2 additions & 0 deletions helix-term/src/keymap/default.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
"o" => goto_prev_comment,
"t" => goto_prev_test,
"p" => goto_prev_paragraph,
"n" => goto_prev_conflict_marker,
"space" => add_newline_above,
},
"]" => { "Right bracket"
Expand All @@ -117,6 +118,7 @@ pub fn default() -> HashMap<Mode, Keymap> {
"o" => goto_next_comment,
"t" => goto_next_test,
"p" => goto_next_paragraph,
"n" => goto_next_conflict_marker,
"space" => add_newline_below,
},

Expand Down

0 comments on commit 3e6a7c8

Please sign in to comment.