Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/formatting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ impl<'a, T: FormatHandler + 'a> FormatContext<'a, T> {

// For some reason, the source_map does not include terminating
// newlines so we must add one on for each file. This is sad.
source_file::append_newline(&mut visitor.buffer);
source_file::append_newline(&mut visitor.buffer, self.config.style_edition());

format_lines(
&mut visitor.buffer,
Expand Down
21 changes: 19 additions & 2 deletions src/source_file.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ use std::io::{self, Write};
use std::path::Path;
use std::sync::Arc;

use crate::NewlineStyle;
use crate::config::FileName;
use crate::emitter::{self, Emitter};
use crate::parse::session::ParseSess;
use crate::{NewlineStyle, StyleEdition};

#[cfg(test)]
use crate::config::Config;
Expand All @@ -16,10 +16,27 @@ use crate::create_emitter;
use crate::formatting::FileRecord;

// Append a newline to the end of each file.
pub(crate) fn append_newline(s: &mut String) {
pub(crate) fn append_newline(s: &mut String, style_edition: StyleEdition) {
if style_edition >= StyleEdition::Edition2027 && s.is_empty() {
return;
}
s.push('\n');
}

#[test]
fn append_newline_adds_newlines_before_2027() {
let mut text = String::new();
append_newline(&mut text, StyleEdition::Edition2024);
assert_eq!(text, "\n");
}

#[test]
fn append_newline_leaves_empty_files_empty_in_2027() {
let mut text = String::new();
append_newline(&mut text, StyleEdition::Edition2027);
assert!(text.is_empty());
}

#[cfg(test)]
pub(crate) fn write_all_files<T>(
source_file: &[FileRecord],
Expand Down
1 change: 1 addition & 0 deletions src/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const FILE_SKIP_LIST: &[&str] = &[
"cfg_mod/bar.rs",
"cfg_mod/foo.rs",
"cfg_mod/wasm32.rs",
"reorder_modules_2027",
"skip/foo.rs",
];

Expand Down
1 change: 1 addition & 0 deletions tests/config/newline_file.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
style_edition = "2024"
1 change: 1 addition & 0 deletions tests/source/newline_file.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
1 change: 1 addition & 0 deletions tests/target/newline_file.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading