Merge #43

43: Condense output in presence of multiple suggestions r=killercup a=oli-obk

part of #41

src/main.rs

@@ -139,6 +139,38 @@ enum AutofixMode {
     Yolo,
 }
 
+fn prelude(suggestion: &Replacement) {
+    let snippet = &suggestion.snippet;
+    if snippet.text.1.is_empty() {
+        // Check whether this suggestion wants to be inserted before or after another line
+        let wants_to_be_on_own_line = suggestion.replacement.ends_with('\n')
+                                   || suggestion.replacement.starts_with('\n');
+        if wants_to_be_on_own_line {
+            println!("{}", "Insert line:".yellow().bold());
+        } else {
+            println!("{}", "At:".yellow().bold());
+            println!(
+                "{lead}{text}{tail}",
+                lead = indent(4, &snippet.text.0),
+                text = "v".red(),
+                tail = snippet.text.2,
+            );
+            println!("{}\n", indent(snippet.text.0.len() as u32, "^").red());
+            println!("{}\n", "insert:".yellow().bold());
+        }
+    } else {
+        println!("{}\n", "Replace:".yellow().bold());
+        println!(
+            "{lead}{text}{tail}\n\n\
+            {with}\n",
+            with = "with:".yellow().bold(),
+            lead = indent(4, &snippet.text.0),
+            text = snippet.text.1.red(),
+            tail = snippet.text.2,
+        );
+    }
+}
+
 fn handle_suggestions(
     suggestions: Vec<Suggestion>,
     mode: AutofixMode,
@@ -164,19 +196,28 @@ fn handle_suggestions(
         let mut i = 0;
         for solution in suggestion.solutions.iter() {
             println!("\n{}", solution.message);
-            for suggestion in solution.replacements.iter() {
-                let snippet = &suggestion.snippet;
-                println!("[{id}]: {suggestion}\n\n\
-                    {lead}{text}{tail}\n\n\
-                    {with}\n\n\
-                    {replacement}\n",
-                    id = i,
-                    suggestion = "Suggestion - Replace:".yellow().bold(),
-                    lead = indent(4, &snippet.text.0),
-                    text = snippet.text.1.red(),
-                    tail = snippet.text.2,
-                    with = "with:".yellow().bold(),
-                    replacement = indent(4, &suggestion.replacement));
+
+            // check whether we can squash all suggestions into a list
+            if solution.replacements.len() > 1 {
+                let first = solution.replacements[0].clone();
+                let all_suggestions_replace_the_same_span = solution
+                    .replacements
+                    .iter()
+                    .all(|s| first.snippet.file_name == s.snippet.file_name
+                         && first.snippet.line_range == s.snippet.line_range);
+                if all_suggestions_replace_the_same_span {
+                    prelude(&first);
+                    for suggestion in solution.replacements.iter() {
+                        println!("[{}]: {}", i, suggestion.replacement.trim());
+                        i += 1;
+                    }
+                    continue;
+                }
+            }
+            for suggestion in &solution.replacements {
+                print!("[{}]: ", i);
+                prelude(&suggestion);
+                println!("{}", indent(4, &suggestion.replacement));
                 i += 1;
             }
         }

tests/tests/libui-rs/simple/output.txt

@@ -1,35 +1,33 @@
 
 
-Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> std::ops::FnMut(&'r controls::Button)>`)
+Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> bitflags::<unnamed>::ops::FnMut(&'r controls::Button)>`)
   --> src/controls.rs:245:17-245:78
 
 try
-[0]: Suggestion - Replace:
+[0]: Replace:
 
 mem::transmute::<*mut c_void, &mut Box<FnMut(&Button)>>(data)(&button)
 
 with:
 
     &mut *(data as *mut Box<FnMut(&Button)>)
 
-
 ==> What do you want to do? [0-9] | [r]eplace | [s]kip | save and [q]uit | [a]bort (without saving)
   > Suggestion accepted. I'll remember that and apply it later.
 
 
-Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> std::ops::FnMut(&'r controls::Entry)>`)
+Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> bitflags::<unnamed>::ops::FnMut(&'r controls::Entry)>`)
   --> src/controls.rs:350:17-350:77
 
 try
-[0]: Suggestion - Replace:
+[0]: Replace:
 
 mem::transmute::<*mut c_void, &mut Box<FnMut(&Entry)>>(data)(&entry);
 
 with:
 
     &mut *(data as *mut Box<FnMut(&Entry)>)
 
-
 ==> What do you want to do? [0-9] | [r]eplace | [s]kip | save and [q]uit | [a]bort (without saving)
   > Suggestion accepted. I'll remember that and apply it later.
 
@@ -38,11 +36,11 @@ try
   --> src/controls.rs:373:5-378:6
 
 try this
-[0]: Suggestion - Replace:
+[0]: At:
+vpub fn new() -> Entry {
+^
 
-pub fn new() -> Entry {
-
-with:
+insert:
 
     impl Default for controls::Entry {
             fn default() -> Self {
@@ -52,7 +50,6 @@ try this
 
 
 
-
 ==> What do you want to do? [0-9] | [r]eplace | [s]kip | save and [q]uit | [a]bort (without saving)
   > Thanks for playing!
 Good work. Let me just apply these 2 changes!

tests/tests/libui-rs/skipping/output.txt

@@ -1,35 +1,33 @@
 
 
-Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> std::ops::FnMut(&'r controls::Button)>`)
+Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> bitflags::<unnamed>::ops::FnMut(&'r controls::Button)>`)
   --> src/controls.rs:245:17-245:78
 
 try
-[0]: Suggestion - Replace:
+[0]: Replace:
 
 mem::transmute::<*mut c_void, &mut Box<FnMut(&Button)>>(data)(&button)
 
 with:
 
     &mut *(data as *mut Box<FnMut(&Button)>)
 
-
 ==> What do you want to do? [0-9] | [r]eplace | [s]kip | save and [q]uit | [a]bort (without saving)
   > Suggestion accepted. I'll remember that and apply it later.
 
 
-Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> std::ops::FnMut(&'r controls::Entry)>`)
+Info: transmute from a pointer type (`*mut libc::c_void`) to a reference type (`&mut std::boxed::Box<for<'r> bitflags::<unnamed>::ops::FnMut(&'r controls::Entry)>`)
   --> src/controls.rs:350:17-350:77
 
 try
-[0]: Suggestion - Replace:
+[0]: Replace:
 
 mem::transmute::<*mut c_void, &mut Box<FnMut(&Entry)>>(data)(&entry);
 
 with:
 
     &mut *(data as *mut Box<FnMut(&Entry)>)
 
-
 ==> What do you want to do? [0-9] | [r]eplace | [s]kip | save and [q]uit | [a]bort (without saving)
   > Skipped.
 
@@ -38,11 +36,11 @@ try
   --> src/controls.rs:373:5-378:6
 
 try this
-[0]: Suggestion - Replace:
+[0]: At:
+vpub fn new() -> Entry {
+^
 
-pub fn new() -> Entry {
-
-with:
+insert:
 
     impl Default for controls::Entry {
             fn default() -> Self {
@@ -52,7 +50,6 @@ try this
 
 
 
-
 ==> What do you want to do? [0-9] | [r]eplace | [s]kip | save and [q]uit | [a]bort (without saving)
   > Thanks for playing!
 Good work. Let me just apply these 1 changes!