unify format_string and format_file

diff --git a/src/lib.rs b/src/lib.rs
index b7af96ac5aa4fb5328d30237aefcb1897e870fd2..93267ef7af339789698d05cc2568980e77a4c5ee 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,7 +27,7 @@
 
 use syntax::ast;
 use syntax::codemap::{mk_sp, CodeMap, Span};
-use syntax::errors::Handler;
+use syntax::errors::{Handler, DiagnosticBuilder};
 use syntax::errors::emitter::{ColorConfig, EmitterWriter};
 use syntax::parse::{self, ParseSess};
 
@@ -263,11 +263,11 @@ fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
 }
 
 // Formatting which depends on the AST.
-fn fmt_ast(krate: &ast::Crate,
-           parse_session: &ParseSess,
-           main_file: &Path,
-           config: &Config)
-           -> FileMap {
+fn format_ast(krate: &ast::Crate,
+              parse_session: &ParseSess,
+              main_file: &Path,
+              config: &Config)
+              -> FileMap {
     let mut file_map = FileMap::new();
     for (path, module) in modules::list_files(krate, parse_session.codemap()) {
         if config.skip_children && path.as_path() != main_file {
@@ -367,43 +367,18 @@ fn format_lines(file_map: &mut FileMap, config: &Config) -> FormatReport {
     report
 }
 
-fn format_string(input: String, config: &Config) -> FileMap {
-    let path = "stdin";
-    let codemap = Rc::new(CodeMap::new());
-
-    let tty_handler = Handler::with_tty_emitter(ColorConfig::Auto,
-                                                None,
-                                                true,
-                                                false,
-                                                codemap.clone());
-    let mut parse_session = ParseSess::with_span_handler(tty_handler, codemap.clone());
-
-    let krate = parse::parse_crate_from_source_str(path.to_owned(),
-                                                   input,
-                                                   Vec::new(),
-                                                   &parse_session)
-                    .unwrap();
-
-    // Suppress error output after parsing.
-    let silent_emitter = Box::new(EmitterWriter::new(Box::new(Vec::new()), None, codemap.clone()));
-    parse_session.span_diagnostic = Handler::with_emitter(true, false, silent_emitter);
-
-    // FIXME: we still use a FileMap even though we only have
-    // one file, because fmt_lines requires a FileMap
-    let mut file_map = FileMap::new();
-
-    // do the actual formatting
-    let mut visitor = FmtVisitor::from_codemap(&parse_session, config);
-    visitor.format_separate_mod(&krate.module);
-
-    // append final newline
-    visitor.buffer.push_str("\n");
-    file_map.insert(path.to_owned(), visitor.buffer);
+fn parse_input(input: Input, parse_session: &ParseSess) -> Result<ast::Crate, DiagnosticBuilder> {
+    let krate = match input {
+        Input::File(file) => parse::parse_crate_from_file(&file, Vec::new(), &parse_session),
+        Input::Text(text) => {
+            parse::parse_crate_from_source_str("stdin".to_owned(), text, Vec::new(), &parse_session)
+        }
+    };
 
-    file_map
+    krate
 }
 
-fn format_file(file: &Path, config: &Config) -> FileMap {
+pub fn format_input(input: Input, config: &Config) -> (FileMap, FormatReport) {
     let codemap = Rc::new(CodeMap::new());
 
     let tty_handler = Handler::with_tty_emitter(ColorConfig::Auto,
@@ -413,27 +388,29 @@ fn format_file(file: &Path, config: &Config) -> FileMap {
                                                 codemap.clone());
     let mut parse_session = ParseSess::with_span_handler(tty_handler, codemap.clone());
 
-    let krate = parse::parse_crate_from_file(file, Vec::new(), &parse_session).unwrap();
+    let main_file = match input {
+        Input::File(ref file) => file.clone(),
+        Input::Text(..) => PathBuf::from("stdin"),
+    };
+
+    let krate = match parse_input(input, &parse_session) {
+        Ok(krate) => krate,
+        Err(mut diagnostic) => {
+            diagnostic.emit();
+            panic!("Unrecoverable parse error");
+        }
+    };
 
     // Suppress error output after parsing.
     let silent_emitter = Box::new(EmitterWriter::new(Box::new(Vec::new()), None, codemap.clone()));
     parse_session.span_diagnostic = Handler::with_emitter(true, false, silent_emitter);
 
-    let mut file_map = fmt_ast(&krate, &parse_session, file, config);
+    let mut file_map = format_ast(&krate, &parse_session, &main_file, config);
 
     // For some reason, the codemap does not include terminating
     // newlines so we must add one on for each file. This is sad.
     filemap::append_newlines(&mut file_map);
 
-    file_map
-}
-
-pub fn format_input(input: Input, config: &Config) -> (FileMap, FormatReport) {
-    let mut file_map = match input {
-        Input::File(ref file) => format_file(file, config),
-        Input::Text(text) => format_string(text, config),
-    };
-
     let report = format_lines(&mut file_map, config);
     (file_map, report)
 }
@@ -455,8 +432,6 @@ pub fn run(input: Input, config: &Config) {
     let write_result = filemap::write_all_files(&file_map, &mut out, config);
 
     if let Err(msg) = write_result {
-        if !ignore_errors {
-            msg!("Error writing files: {}", msg);
-        }
+        msg!("Error writing files: {}", msg);
     }
 }

diff --git a/tests/system.rs b/tests/system.rs
index b6518a559b9463e98d89b32d661ba56f2f0a5c3b..6b13e77a7be40dd906f0af45922e3e9052612bcf 100644 (file)
--- a/tests/system.rs
+++ b/tests/system.rs
@@ -139,6 +139,14 @@ fn self_tests() {
             warnings);
 }
 
+#[test]
+fn stdin_formatting_smoke_test() {
+    let input = Input::Text("fn main () {}".to_owned());
+    let config = Config::default();
+    let (file_map, _report) = format_input(input, &config);
+    assert_eq!(file_map["stdin"].to_string(), "fn main() {}\n")
+}
+
 // For each file, run rustfmt and collect the output.
 // Returns the number of files checked and the number of failures.
 fn check_files<I>(files: I) -> (Vec<FormatReport>, u32, u32)