on master help sign in
Fix typos (#3858)
a73e83etaupiqueur
CHANGELOG.md+3−3
@@ -684,7 +684,7 @@ Usability improvements and fixes:
684- File picker configuration ([#988](https://github.com/helix-editor/helix/pull/988))
684- File picker configuration ([#988](https://github.com/helix-editor/helix/pull/988))
685- Fix surround cursor position calculation ([#1183](https://github.com/helix-editor/helix/pull/1183))
685- Fix surround cursor position calculation ([#1183](https://github.com/helix-editor/helix/pull/1183))
686- Accept count for goto_window ([#1033](https://github.com/helix-editor/helix/pull/1033))
686- Accept count for goto_window ([#1033](https://github.com/helix-editor/helix/pull/1033))
687−- Make kill_to_line_end behave like emacs ([#1235](https://github.com/helix-editor/helix/pull/1235))
687+- Make kill_to_line_end behave like Emacs ([#1235](https://github.com/helix-editor/helix/pull/1235))
688- Only use a single documentation popup ([#1241](https://github.com/helix-editor/helix/pull/1241))
688- Only use a single documentation popup ([#1241](https://github.com/helix-editor/helix/pull/1241))
689- ui: popup: Don't allow scrolling past the end of content ([`3307f44c`](https://github.com/helix-editor/helix/commit/3307f44c))
689- ui: popup: Don't allow scrolling past the end of content ([`3307f44c`](https://github.com/helix-editor/helix/commit/3307f44c))
690- Open files with spaces in filename, allow opening multiple files ([#1231](https://github.com/helix-editor/helix/pull/1231))
690- Open files with spaces in filename, allow opening multiple files ([#1231](https://github.com/helix-editor/helix/pull/1231))
@@ -922,7 +922,7 @@ to distinguish it in bug reports..
922 on cargo run. `~/.config/helix/runtime` can also be used.
922 on cargo run. `~/.config/helix/runtime` can also be used.
923- Registers can now be selected via " (for example `"ay`)
923- Registers can now be selected via " (for example `"ay`)
924- Support for Nix files was added
924- Support for Nix files was added
925−- Movement is now fully tested and matches kakoune implementation
925+- Movement is now fully tested and matches Kakoune implementation
926- A per-file LSP symbol picker was added to space+s
926- A per-file LSP symbol picker was added to space+s
927- Selection can be replaced with yanked text via R
927- Selection can be replaced with yanked text via R
928
928
@@ -946,7 +946,7 @@ Keymaps:
946- The runtime/ can now optionally be embedded in the binary
946- The runtime/ can now optionally be embedded in the binary
947- Haskell syntax added
947- Haskell syntax added
948- Window mode (ctrl-w) added
948- Window mode (ctrl-w) added
949−- Show matching bracket (vim's matchbrackets)
949+- Show matching bracket (Vim's matchbrackets)
950- Themes now support style modifiers
950- Themes now support style modifiers
951- First user contributed theme
951- First user contributed theme
952- Create a document if it doesn't exist yet on save
952- Create a document if it doesn't exist yet on save
README.md+4−4
@@ -4,10 +4,10 @@
4
4
5![Screenshot](./screenshot.png)
5![Screenshot](./screenshot.png)
6
6
7−A kakoune / neovim inspired editor, written in Rust.
7+A Kakoune / Neovim inspired editor, written in Rust.
8
8
9−The editing model is very heavily based on kakoune; during development I found
9+The editing model is very heavily based on Kakoune; during development I found
10−myself agreeing with most of kakoune's design decisions.
10+myself agreeing with most of Kakoune's design decisions.
11
11
12For more information, see the [website](https://helix-editor.com) or
12For more information, see the [website](https://helix-editor.com) or
13[documentation](https://docs.helix-editor.com/).
13[documentation](https://docs.helix-editor.com/).
@@ -24,7 +24,7 @@ All shortcuts/keymaps can be found [in the documentation on the website](https:/
24- Smart, incremental syntax highlighting and code editing via tree-sitter
24- Smart, incremental syntax highlighting and code editing via tree-sitter
25
25
26It's a terminal-based editor first, but I'd like to explore a custom renderer
26It's a terminal-based editor first, but I'd like to explore a custom renderer
27−(similar to emacs) in wgpu or skulpin.
27+(similar to Emacs) in wgpu or skulpin.
28
28
29Note: Only certain languages have indentation definitions at the moment. Check
29Note: Only certain languages have indentation definitions at the moment. Check
30`runtime/queries/<lang>/` for `indents.scm`.
30`runtime/queries/<lang>/` for `indents.scm`.
book/src/commands.md+1−1
@@ -1,5 +1,5 @@
1# Commands
1# Commands
2
2
3−Command mode can be activated by pressing `:`, similar to vim. Built-in commands:
3+Command mode can be activated by pressing `:`, similar to Vim. Built-in commands:
4
4
5{{#include ./generated/typable-cmd.md}}
5{{#include ./generated/typable-cmd.md}}
book/src/from-vim.md+2−2
@@ -1,7 +1,7 @@
1# Migrating from Vim
1# Migrating from Vim
2
2
3−Helix's editing model is strongly inspired from vim and kakoune, and a notable
3+Helix's editing model is strongly inspired from Vim and Kakoune, and a notable
4−difference from vim (and the most striking similarity to kakoune) is that Helix
4+difference from Vim (and the most striking similarity to Kakoune) is that Helix
5follows the `selection → action` model. This means that the whatever you are
5follows the `selection → action` model. This means that the whatever you are
6going to act on (a word, a paragraph, a line, etc) is selected first and the
6going to act on (a word, a paragraph, a line, etc) is selected first and the
7action itself (delete, change, yank, etc) comes second. A cursor is simply a
7action itself (delete, change, yank, etc) comes second. A cursor is simply a
book/src/guides/adding_languages.md+1−1
@@ -29,7 +29,7 @@ language with the path `runtime/queries/<name>/`. The tree-sitter
29gives more info on how to write queries.
29gives more info on how to write queries.
30
30
31> NOTE: When evaluating queries, the first matching query takes
31> NOTE: When evaluating queries, the first matching query takes
32−precedence, which is different from other editors like neovim where
32+precedence, which is different from other editors like Neovim where
33the last matching query supersedes the ones before it. See
33the last matching query supersedes the ones before it. See
34[this issue][neovim-query-precedence] for an example.
34[this issue][neovim-query-precedence] for an example.
35
35
book/src/keymap.md+2−2
@@ -27,7 +27,7 @@
27
27
28### Movement
28### Movement
29
29
30−> NOTE: Unlike vim, `f`, `F`, `t` and `T` are not confined to the current line.
30+> NOTE: Unlike Vim, `f`, `F`, `t` and `T` are not confined to the current line.
31
31
32| Key | Description | Command |
32| Key | Description | Command |
33| ----- | ----------- | ------- |
33| ----- | ----------- | ------- |
@@ -229,7 +229,7 @@ TODO: Mappings for selecting syntax nodes (a superset of `[`).
229
229
230#### Window mode
230#### Window mode
231
231
232−This layer is similar to vim keybindings as kakoune does not support window.
232+This layer is similar to Vim keybindings as Kakoune does not support window.
233
233
234| Key | Description | Command |
234| Key | Description | Command |
235| ----- | ------------- | ------- |
235| ----- | ------------- | ------- |
book/src/usage.md+2−2
@@ -128,8 +128,8 @@ will move the selection over to the "func" `identifier`.
128![textobject-demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)
128![textobject-demo](https://user-images.githubusercontent.com/23398472/124231131-81a4bb00-db2d-11eb-9d10-8e577ca7b177.gif)
129![textobject-treesitter-demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)
129![textobject-treesitter-demo](https://user-images.githubusercontent.com/23398472/132537398-2a2e0a54-582b-44ab-a77f-eb818942203d.gif)
130
130
131−- `ma` - Select around the object (`va` in vim, `<alt-a>` in kakoune)
131+- `ma` - Select around the object (`va` in Vim, `<alt-a>` in Kakoune)
132−- `mi` - Select inside the object (`vi` in vim, `<alt-i>` in kakoune)
132+- `mi` - Select inside the object (`vi` in Vim, `<alt-i>` in Kakoune)
133
133
134| Key after `mi` or `ma` | Textobject selected |
134| Key after `mi` or `ma` | Textobject selected |
135| --- | --- |
135| --- | --- |
helix-core/src/movement.rs+1−1
@@ -270,7 +270,7 @@ pub enum WordMotionTarget {
270 NextWordEnd,
270 NextWordEnd,
271 PrevWordStart,
271 PrevWordStart,
272 PrevWordEnd,
272 PrevWordEnd,
273− // A "Long word" (also known as a WORD in vim/kakoune) is strictly
273+ // A "Long word" (also known as a WORD in Vim/Kakoune) is strictly
274 // delimited by whitespace, and can consist of punctuation as well
274 // delimited by whitespace, and can consist of punctuation as well
275 // as alphanumerics.
275 // as alphanumerics.
276 NextLongWordStart,
276 NextLongWordStart,