aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/commands/typed.rs20
1 files changed, 8 insertions, 12 deletions
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
index 7588b708..5ea61108 100644
--- a/helix-term/src/commands/typed.rs
+++ b/helix-term/src/commands/typed.rs
@@ -1840,30 +1840,26 @@ fn reflow(
}
let scrolloff = cx.editor.config().scrolloff;
+ let cfg_text_width: usize = cx.editor.config().text_width;
let (view, doc) = current!(cx.editor);
- const DEFAULT_MAX_LEN: usize = 79;
-
- // Find the max line length by checking the following sources in order:
+ // Find the text_width by checking the following sources in order:
// - The passed argument in `args`
- // - The configured max_line_len for this language in languages.toml
- // - The const default we set above
- let max_line_len: usize = args
+ // - The configured text-width for this language in languages.toml
+ // - The configured text-width in the config.toml
+ let text_width: usize = args
.get(0)
.map(|num| num.parse::<usize>())
.transpose()?
- .or_else(|| {
- doc.language_config()
- .and_then(|config| config.max_line_length)
- })
- .unwrap_or(DEFAULT_MAX_LEN);
+ .or_else(|| doc.language_config().and_then(|config| config.text_width))
+ .unwrap_or(cfg_text_width);
let rope = doc.text();
let selection = doc.selection(view.id);
let transaction = Transaction::change_by_selection(rope, selection, |range| {
let fragment = range.fragment(rope.slice(..));
- let reflowed_text = helix_core::wrap::reflow_hard_wrap(&fragment, max_line_len);
+ let reflowed_text = helix_core::wrap::reflow_hard_wrap(&fragment, text_width);
(range.from(), range.to(), Some(reflowed_text))
});