Skip to content

rework positioning/rendering and enable softwrap/virtual text #5420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 31, 2023
Merged

rework positioning/rendering and enable softwrap/virtual text #5420

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f1791db
rework positioning/rendering, enables softwrap/virtual text
pascalkuthe Dec 3, 2022
71345e5
Apply suggestions from code review
pascalkuthe Jan 25, 2023
3dbb0bc
improve documentation for positoning functions
pascalkuthe Jan 25, 2023
692bbaa
simplify tests
pascalkuthe Jan 25, 2023
f743d9a
fix documentation of Grapheme::width
pascalkuthe Jan 25, 2023
d54df49
Apply suggestions from code review
pascalkuthe Jan 29, 2023
a5d3c4b
add explicit drop invocation
pascalkuthe Jan 29, 2023
9ff4750
Add explicit MoveFn type alias
pascalkuthe Jan 29, 2023
2c8faf2
add docuntation to Editor::cursor_cache
pascalkuthe Jan 29, 2023
39f2b4e
fix a few typos
pascalkuthe Jan 29, 2023
1d49330
explain use of allow(deprecated)
pascalkuthe Jan 29, 2023
ed7782d
make gj and gk extend in select mode
pascalkuthe Jan 30, 2023
bfd5355
remove unneded debug and TODO
pascalkuthe Jan 30, 2023
7f6882f
mark tab_width_at #[inline]
pascalkuthe Jan 31, 2023
cdac97b
add fast-path to move_vertically_visual in case softwrap is disabled
pascalkuthe Jan 31, 2023
5d1e53a
rename first_line to first_visual_line
pascalkuthe Jan 31, 2023
1ec785b
simplify duplicate if/else
pascalkuthe Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion book/src/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,4 +307,25 @@ Currently unused

#### `[editor.gutters.spacer]` Section

Currently unused
Currently unused

### `[editor.soft-wrap]` Section

Options for soft wrapping lines that exceed the view width

| Key | Description | Default |
| --- | --- | --- |
| `enable` | Whether soft wrapping is enabled. | `false` |
| `max-wrap` | Maximum free space left at the end of the line. | `20` |
| `max-indent-retain` | Maximum indentation to carry over when soft wrapping a line. | `40` |
| `wrap-indicator` | Text inserted before soft wrapped lines, highlighted with `ui.virtual.wrap` | `↪ ` |

Example:

```toml
[editor.soft-wrap]
enable = true
max-wrap = 25 # increase value to reduce forced mid-word wrapping
max-indent-retain = 0
wrap-indicator = "" # set wrap-indicator to "" to hide it
```
2 changes: 1 addition & 1 deletion book/src/languages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ These configuration keys are available:
| `config` | Language Server configuration |
| `grammar` | The tree-sitter grammar to use (defaults to the value of `name`) |
| `formatter` | The formatter for the language, it will take precedence over the lsp when defined. The formatter must be able to take the original file as input from stdin and write the formatted file to stdout |
| `max-line-length` | Maximum line length. Used for the `:reflow` command |
| `max-line-length` | Maximum line length. Used for the `:reflow` command and soft-wrapping |

### File-type detection and the `file-types` key

Expand Down
Loading