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

Support EditorConfig (#13056)

Browse source
This commit is contained in:
Michael Davis 2025-03-22 03:06:41 -04:00 • committed by GitHub
parent f6cb90593d
commit 3a63e85b6a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 415 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
helix-term/src/commands/typed.rs
View file

@ -326,13 +326,13 @@ fn write_impl(cx: &mut compositor::Context, path: Option<&str>, force: bool) ->
let jobs = &mut cx.jobs;
let (view, doc) = current!(cx.editor);
if config.trim_trailing_whitespace {
if doc.trim_trailing_whitespace() {
trim_trailing_whitespace(doc, view.id);
}
if config.trim_final_newlines {
trim_final_newlines(doc, view.id);
}
if config.insert_final_newline {
if doc.insert_final_newline() {
insert_final_newline(doc, view.id);
}
@ -738,13 +738,13 @@ pub fn write_all_impl(
let doc = doc_mut!(cx.editor, &doc_id);
let view = view_mut!(cx.editor, target_view);
if config.trim_trailing_whitespace {
if doc.trim_trailing_whitespace() {
trim_trailing_whitespace(doc, target_view);
}
if config.trim_final_newlines {
trim_final_newlines(doc, target_view);
}
if config.insert_final_newline {
if doc.insert_final_newline() {
insert_final_newline(doc, target_view);
}
@ -2146,7 +2146,6 @@ fn reflow(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyho
}
let scrolloff = cx.editor.config().scrolloff;
let cfg_text_width: usize = cx.editor.config().text_width;
let (view, doc) = current!(cx.editor);
// Find the text_width by checking the following sources in order:
@ -2157,8 +2156,7 @@ fn reflow(cx: &mut compositor::Context, args: Args, event: PromptEvent) -> anyho
.first()
.map(|num| num.parse::<usize>())
.transpose()?
.or_else(|| doc.language_config().and_then(|config| config.text_width))
.unwrap_or(cfg_text_width);
.unwrap_or_else(|| doc.text_width());
let rope = doc.text();