diff options
| author | gibbz00 | 2023-04-08 12:18:11 +0000 |
|---|---|---|
| committer | GitHub | 2023-04-08 12:18:11 +0000 |
| commit | af88a3c15cc4ddbb1e2f2ea6492868ffb8aba40b (patch) | |
| tree | 3b60461b6ea22246d8c2cabf116e6cd9e743d1a2 | |
| parent | e856906f766aa6d58aba6f6bca9e2e1879b1629d (diff) | |
Fix #6605: Remove soft-wrap.enable option wrapping. (#6656)
Co-authored-by: gibbz00 <gabrielhansson@gmail.com>
| -rw-r--r-- | helix-core/src/syntax.rs | 2 | ||||
| -rw-r--r-- | helix-view/src/document.rs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs index 40846967..0e6696db 100644 --- a/helix-core/src/syntax.rs +++ b/helix-core/src/syntax.rs @@ -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. diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs index eca60026..65a5a6e2 100644 --- a/helix-view/src/document.rs +++ b/helix-view/src/document.rs @@ -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) |