Revert "Fix #6605: Remove soft-wrap.enable option wrapping. (#6656)"

This reverts commit af88a3c.
helix-editor · Apr 8, 2023 · 6ebfad1 · 6ebfad1
1 parent 25858ec
commit 6ebfad1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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: bool,
+    pub enable: Option<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
@@ -1444,8 +1444,9 @@ impl Document {
             .as_ref()
             .and_then(|config| config.soft_wrap.as_ref());
         let enable_soft_wrap = language_soft_wrap
-            .map(|soft_wrap| soft_wrap.enable)
-            .unwrap_or_else(|| editor_soft_wrap.enable);
+            .and_then(|soft_wrap| soft_wrap.enable)
+            .or(editor_soft_wrap.enable)
+            .unwrap_or(false);
         let max_wrap = language_soft_wrap
             .and_then(|soft_wrap| soft_wrap.max_wrap)
             .or(config.soft_wrap.max_wrap)