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

Co-authored-by: gibbz00 <gabrielhansson@gmail.com>
pull/6552/head^2
gibbz00 2 years ago committed by GitHub
parent e856906f76
commit af88a3c15c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -555,7 +555,7 @@ impl LanguageConfiguration {
#[serde(default, rename_all = "kebab-case", deny_unknown_fields)] #[serde(default, rename_all = "kebab-case", deny_unknown_fields)]
pub struct SoftWrap { pub struct SoftWrap {
/// Soft wrap lines that exceed viewport width. Default to off /// 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. /// 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 /// 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. /// the word is simply split at the end of the line.

@ -1444,9 +1444,8 @@ impl Document {
.as_ref() .as_ref()
.and_then(|config| config.soft_wrap.as_ref()); .and_then(|config| config.soft_wrap.as_ref());
let enable_soft_wrap = language_soft_wrap let enable_soft_wrap = language_soft_wrap
.and_then(|soft_wrap| soft_wrap.enable) .map(|soft_wrap| soft_wrap.enable)
.or(editor_soft_wrap.enable) .unwrap_or_else(|| editor_soft_wrap.enable);
.unwrap_or(false);
let max_wrap = language_soft_wrap let max_wrap = language_soft_wrap
.and_then(|soft_wrap| soft_wrap.max_wrap) .and_then(|soft_wrap| soft_wrap.max_wrap)
.or(config.soft_wrap.max_wrap) .or(config.soft_wrap.max_wrap)

Loading…
Cancel
Save