Skip to content

Commit

Permalink
fix(editor/#3149): Change word wrap configuration default to be on (#…
Browse files Browse the repository at this point in the history
…3161)

__Issue:__ Both Vim & VSCode default to having word-wrap (soft wrap) enabled, but Onivim defaults to having it off. There isn't a reason to be different from both of their default settings.

__Fix:__ Change word-wrap (soft wrap) to be on by default.

Fixes #3149
  • Loading branch information
bryphe authored Feb 19, 2021
1 parent 19494d9 commit 1aaad90
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES_CURRENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- #3147 - Editor: Fix minimap scroll synchronization for large files
- #3077 - Terminal: Use editor font as default (related #3062)
- #3146 - Vim: Fix command-line staying open when clicking the editor or file explorer (fixes #3031)
- #3161 - Configuration: Turn soft word-wrap on by default (fixes #3161)

### Performance

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/configuration/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ The configuration file, `configuration.json` is in the Oni2 directory, whose loc

- `editor.wordBasedSuggestions` __(_bool_ default: `true`)__ When `true`, keywords are provided as completion suggestions.

- `editor.wordWrap` __(_bool_ default: `false`)__ When `true`, Onivim will soft-wrap lines at the viewport boundary.
- `editor.wordWrap` __(_bool_ default: `true`)__ When `true`, Onivim will soft-wrap lines at the viewport boundary.

- `editor.rulers` __(_list of int_ default: `[]`)__ - Render vertical rulers at given columns.

Expand Down
2 changes: 1 addition & 1 deletion src/Feature/Editor/EditorConfiguration.re
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ let smoothScroll =
let tabSize = setting("editor.tabSize", int, ~default=4);

let wordWrap =
setting("editor.wordWrap", ~vim=VimSettings.wrap, wordWrap, ~default=`Off);
setting("editor.wordWrap", ~vim=VimSettings.wrap, wordWrap, ~default=`On);

let wordWrapColumn = setting("editor.wordWrapColumn", int, ~default=80);

Expand Down

0 comments on commit 1aaad90

Please sign in to comment.