Add bounded soft wrap (#16586)

0x2CA and Conrad Irwin created 1 year ago

Closes #14700 #8164

Release Notes:

- Added `soft_wrap` value `bounded`,EditorWidth and PreferredLineLength
min value

---------

Co-authored-by: Conrad Irwin <[e-mail]>

Change summary

assets/settings/default.json             | 2 ++
crates/editor/src/editor.rs              | 8 +++++++-
crates/editor/src/element.rs             | 3 ++-
crates/language/src/language_settings.rs | 4 +++-
4 files changed, 14 insertions(+), 3 deletions(-)

Detailed changes

assets/settings/default.json

@@ -510,6 +510,8 @@
   //      "soft_wrap": "editor_width",
   // 4. Soft wrap lines at the preferred line length.
   //      "soft_wrap": "preferred_line_length",
+  // 5. Soft wrap lines at the preferred line length or the editor width (whichever is smaller).
+  //      "soft_wrap": "bounded",
   "soft_wrap": "prefer_line",
   // The column at which to soft-wrap lines, for buffers where soft-wrap
   // is enabled.

crates/editor/src/editor.rs

@@ -375,6 +375,7 @@ pub enum SoftWrap {
     PreferLine,
     EditorWidth,
     Column(u32),
+    Bounded(u32),
 }
 
 #[derive(Clone)]
@@ -10491,6 +10492,8 @@ impl Editor {
         if settings.show_wrap_guides {
             if let SoftWrap::Column(soft_wrap) = self.soft_wrap_mode(cx) {
                 wrap_guides.push((soft_wrap as usize, true));
+            } else if let SoftWrap::Bounded(soft_wrap) = self.soft_wrap_mode(cx) {
+                wrap_guides.push((soft_wrap as usize, true));
             }
             wrap_guides.extend(settings.wrap_guides.iter().map(|guide| (*guide, false)))
         }
@@ -10510,6 +10513,9 @@ impl Editor {
             language_settings::SoftWrap::PreferredLineLength => {
                 SoftWrap::Column(settings.preferred_line_length)
             }
+            language_settings::SoftWrap::Bounded => {
+                SoftWrap::Bounded(settings.preferred_line_length)
+            }
         }
     }
 
@@ -10551,7 +10557,7 @@ impl Editor {
         } else {
             let soft_wrap = match self.soft_wrap_mode(cx) {
                 SoftWrap::None | SoftWrap::PreferLine => language_settings::SoftWrap::EditorWidth,
-                SoftWrap::EditorWidth | SoftWrap::Column(_) => {
+                SoftWrap::EditorWidth | SoftWrap::Column(_) | SoftWrap::Bounded(_) => {
                     language_settings::SoftWrap::PreferLine
                 }
             };

crates/editor/src/element.rs

@@ -4996,7 +4996,8 @@ impl Element for EditorElement {
                                     Some((MAX_LINE_LEN / 2) as f32 * em_advance)
                                 }
                                 SoftWrap::EditorWidth => Some(editor_width),
-                                SoftWrap::Column(column) => {
+                                SoftWrap::Column(column) => Some(column as f32 * em_advance),
+                                SoftWrap::Bounded(column) => {
                                     Some(editor_width.min(column as f32 * em_advance))
                                 }
                             };

crates/language/src/language_settings.rs

@@ -379,10 +379,12 @@ pub enum SoftWrap {
     None,
     /// Prefer a single line generally, unless an overly long line is encountered.
     PreferLine,
-    /// Soft wrap lines that overflow the editor
+    /// Soft wrap lines that exceed the editor width
     EditorWidth,
     /// Soft wrap lines at the preferred line length
     PreferredLineLength,
+    /// Soft wrap line at the preferred line length or the editor width (whichever is smaller)
+    Bounded,
 }
 
 /// Controls the behavior of formatting files when they are saved.