use std::io::{self, Write};
use std::path::Path;
-use syntax::source_map::SourceMap;
-
-use crate::checkstyle::output_checkstyle_file;
-use crate::config::{Config, EmitMode, FileName, Verbosity};
-use crate::rustfmt_diff::{make_diff, print_diff, ModifiedLines};
+use crate::config::FileName;
+use crate::emitter::{self, Emitter};
+use crate::parse::session::ParseSess;
+use crate::NewlineStyle;
+#[cfg(test)]
+use crate::config::Config;
+#[cfg(test)]
+use crate::create_emitter;
#[cfg(test)]
use crate::formatting::FileRecord;
+use rustc_data_structures::sync::Lrc;
+
// Append a newline to the end of each file.
-pub fn append_newline(s: &mut String) {
- s.push_str("\n");
+pub(crate) fn append_newline(s: &mut String) {
+ s.push('\n');
}
#[cfg(test)]
where
T: Write,
{
- if config.emit_mode() == EmitMode::Checkstyle {
- write!(out, "{}", crate::checkstyle::header())?;
- }
+ let mut emitter = create_emitter(config);
+
+ emitter.emit_header(out)?;
for &(ref filename, ref text) in source_file {
- write_file(None, filename, text, out, config)?;
- }
- if config.emit_mode() == EmitMode::Checkstyle {
- write!(out, "{}", crate::checkstyle::footer())?;
+ write_file(
+ None,
+ filename,
+ text,
+ out,
+ &mut *emitter,
+ config.newline_style(),
+ )?;
}
+ emitter.emit_footer(out)?;
Ok(())
}
-pub fn write_file<T>(
- source_map: Option<&SourceMap>,
+pub(crate) fn write_file<T>(
+ parse_sess: Option<&ParseSess>,
filename: &FileName,
formatted_text: &str,
out: &mut T,
- config: &Config,
-) -> Result<bool, io::Error>
+ emitter: &mut dyn Emitter,
+ newline_style: NewlineStyle,
+) -> Result<emitter::EmitterResult, io::Error>
where
T: Write,
{
}
}
- impl From<&FileName> for syntax_pos::FileName {
- fn from(filename: &FileName) -> syntax_pos::FileName {
+ impl From<&FileName> for rustc_span::FileName {
+ fn from(filename: &FileName) -> rustc_span::FileName {
match filename {
- FileName::Real(path) => syntax_pos::FileName::Real(path.to_owned()),
- FileName::Stdin => syntax_pos::FileName::Custom("stdin".to_owned()),
+ FileName::Real(path) => {
+ rustc_span::FileName::Real(rustc_span::RealFileName::LocalPath(path.to_owned()))
+ }
+ FileName::Stdin => rustc_span::FileName::Custom("stdin".to_owned()),
}
}
}
- // If parse session is around (cfg(not(test))) then try getting source from
- // there instead of hitting the file system. This also supports getting
+ // SourceFile's in the SourceMap will always have Unix-style line endings
+ // See: https://github.com/rust-lang/rustfmt/issues/3850
+ // So if the user has explicitly overridden the rustfmt `newline_style`
+ // config and `filename` is FileName::Real, then we must check the file system
+ // to get the original file value in order to detect newline_style conflicts.
+ // Otherwise, parse session is around (cfg(not(test))) and newline_style has been
+ // left as the default value, then try getting source from the parse session
+ // source map instead of hitting the file system. This also supports getting
// original text for `FileName::Stdin`.
- let original_text = source_map
- .and_then(|x| x.get_source_file(&filename.into()))
- .and_then(|x| x.src.as_ref().map(ToString::to_string));
- let original_text = match original_text {
- Some(ori) => ori,
- None => fs::read_to_string(ensure_real_path(filename))?,
- };
-
- match config.emit_mode() {
- EmitMode::Files if config.make_backup() => {
- let filename = ensure_real_path(filename);
- if original_text != formatted_text {
- // Do a little dance to make writing safer - write to a temp file
- // rename the original to a .bk, then rename the temp file to the
- // original.
- let tmp_name = filename.with_extension("tmp");
- let bk_name = filename.with_extension("bk");
-
- fs::write(&tmp_name, formatted_text)?;
- fs::rename(filename, bk_name)?;
- fs::rename(tmp_name, filename)?;
- }
+ let original_text = if newline_style != NewlineStyle::Auto && *filename != FileName::Stdin {
+ Lrc::new(fs::read_to_string(ensure_real_path(filename))?)
+ } else {
+ match parse_sess.and_then(|sess| sess.get_original_snippet(filename)) {
+ Some(ori) => ori,
+ None => Lrc::new(fs::read_to_string(ensure_real_path(filename))?),
}
- EmitMode::Files => {
- // Write text directly over original file if there is a diff.
- let filename = ensure_real_path(filename);
-
- if original_text != formatted_text {
- fs::write(filename, formatted_text)?;
- }
- }
- EmitMode::Stdout | EmitMode::Coverage => {
- if config.verbose() != Verbosity::Quiet {
- println!("{}:\n", filename);
- }
- write!(out, "{}", formatted_text)?;
- }
- EmitMode::ModifiedLines => {
- let mismatch = make_diff(&original_text, formatted_text, 0);
- let has_diff = !mismatch.is_empty();
- write!(out, "{}", ModifiedLines::from(mismatch))?;
- return Ok(has_diff);
- }
- EmitMode::Checkstyle => {
- let filename = ensure_real_path(filename);
+ };
- let diff = make_diff(&original_text, formatted_text, 3);
- output_checkstyle_file(out, filename, diff)?;
- }
- EmitMode::Diff => {
- let mismatch = make_diff(&original_text, formatted_text, 3);
- let has_diff = !mismatch.is_empty();
- print_diff(
- mismatch,
- |line_num| format!("Diff in {} at line {}:", filename, line_num),
- config,
- );
- return Ok(has_diff);
- }
- }
+ let formatted_file = emitter::FormattedFile {
+ filename,
+ original_text: original_text.as_str(),
+ formatted_text,
+ };
- // when we are not in diff mode, don't indicate differing files
- Ok(false)
+ emitter.emit_formatted_file(out, formatted_file)
}
projects / rust.git / blobdiff