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
8 changes: 8 additions & 0 deletions src/visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
fn visit_stmt(&mut self, stmt: &Stmt<'_>, include_empty_semi: bool) {
debug!("visit_stmt: {}", self.psess.span_to_debug_info(stmt.span()));

// Preserve original source snippet if the statement isn't in the selected file lines.
if out_of_file_lines_range!(self, stmt.span()) {
let stmt_span = source!(self, stmt.span());
self.push_str(self.snippet(mk_sp(self.last_pos, stmt_span.hi())));
self.last_pos = stmt_span.hi();
return;
}

if stmt.is_empty() {
// If the statement is empty, just skip over it. Before that, make sure any comment
// snippet preceding the semicolon is picked up.
Expand Down
7 changes: 7 additions & 0 deletions tests/source/issue-6863/empty-stmt.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// rustfmt-file_lines: [{"file":"tests/source/issue-6863/empty-stmt.rs","range":[5,5]}]

fn main() {
;
println!("b");
;
}
7 changes: 7 additions & 0 deletions tests/source/issue-6863/fn-stmts.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// rustfmt-file_lines: [{"file":"tests/source/issue-6863/fn-stmts.rs","range":[5,5]}]

fn main() {
println!("a");
println!("b");
println!("c");
}
7 changes: 7 additions & 0 deletions tests/target/issue-6863/empty-stmt.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// rustfmt-file_lines: [{"file":"tests/source/issue-6863/empty-stmt.rs","range":[5,5]}]

fn main() {
;
println!("b");
;
}
7 changes: 7 additions & 0 deletions tests/target/issue-6863/fn-stmts.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// rustfmt-file_lines: [{"file":"tests/source/issue-6863/fn-stmts.rs","range":[5,5]}]

fn main() {
println!("a");
println!("b");
println!("c");
}
Loading