Merge pull request #193 from oli-obk/multi_file_suggs

Multi file suggs
oli-obk · Jan 24, 2024 · f4a4242 · f4a4242
2 parents addbd2c + f53f3f6
commit f4a4242
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+* report an error instead of panicking when encountering a suggestion that does not belong to the main file.
+
 ### Changed
 
 * crate-private span handling was passed off to the `spanned` crate, improving some diagnostics along the way.

diff --git a/src/lib.rs b/src/lib.rs
@@ -874,6 +874,14 @@ fn run_rustfix(
             if suggestions.is_empty() {
                 None
             } else {
+                let path_str = path.display().to_string();
+                for sugg in &suggestions {
+                    for snip in &sugg.snippets {
+                        if snip.file_name != path_str {
+                            return Some(Err(anyhow::anyhow!("cannot apply suggestions for `{}` since main file is `{path_str}`. Please use `//@no-rustfix` to disable rustfix", snip.file_name)));
+                        }
+                    }
+                }
                 Some(rustfix::apply_suggestions(
                     &std::fs::read_to_string(path).unwrap(),
                     &suggestions,