Skip to content

Commit

Permalink
Fix helix-editor#6605: Remove soft-wrap.enable option wrapping.
Browse files Browse the repository at this point in the history
  • Loading branch information
gibbz00 committed Apr 8, 2023
1 parent e856906 commit 1103d39
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion helix-core/src/syntax.rs
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ impl LanguageConfiguration {
#[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
pub struct SoftWrap {
/// Soft wrap lines that exceed viewport width. Default to off
pub enable: Option<bool>,
pub enable: bool,
/// Maximum space left free at the end of the line.
/// This space is used to wrap text at word boundaries. If that is not possible within this limit
/// the word is simply split at the end of the line.
Expand Down
5 changes: 2 additions & 3 deletions helix-view/src/document.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1444,9 +1444,8 @@ impl Document {
.as_ref()
.and_then(|config| config.soft_wrap.as_ref());
let enable_soft_wrap = language_soft_wrap
.and_then(|soft_wrap| soft_wrap.enable)
.or(editor_soft_wrap.enable)
.unwrap_or(false);
.map(|soft_wrap| soft_wrap.enable)
.unwrap_or_else(|| editor_soft_wrap.enable);
let max_wrap = language_soft_wrap
.and_then(|soft_wrap| soft_wrap.max_wrap)
.or(config.soft_wrap.max_wrap)
Expand Down

0 comments on commit 1103d39

Please sign in to comment.