mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-06 04:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Co-authored-by: gibbz00 <gabrielhansson@gmail.com>
This commit is contained in:
gibbz00 2023-04-08 14:18:11 +02:00 • committed by GitHub
parent e856906f76
commit af88a3c15c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helix-core/src/syntax.rs
View file

@ -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.

5
helix-view/src/document.rs
View file

@ -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)