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
1 change: 1 addition & 0 deletions src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ macro_rules! skip_out_of_file_lines_range {
macro_rules! skip_out_of_file_lines_range_visitor {
($self:ident, $span:expr) => {
if out_of_file_lines_range!($self, $span) {
$self.push_rewrite($span, None);
return;
}
}
Expand Down
14 changes: 13 additions & 1 deletion src/visitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,19 @@ impl<'a> FmtVisitor<'a> {
})
.count();
let (use_items, rest) = items_left.split_at(use_item_length);
self.format_imports(use_items);

let at_least_one_in_file_lines = use_items
.iter()
.any(|item| !out_of_file_lines_range!(self, item.span));

if at_least_one_in_file_lines {
self.format_imports(use_items);
} else {
for item in use_items {
self.push_rewrite(item.span, None);
}
}

items_left = rest;
} else {
// `unwrap()` is safe here because we know `items_left`
Expand Down
12 changes: 11 additions & 1 deletion tests/source/file-lines-item.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// rustfmt-file_lines: [{"file":"tests/source/file-lines-item.rs","range":[5,7]}]
// rustfmt-file_lines: [{"file":"tests/source/file-lines-item.rs","range":[7,9]}]
// rustfmt-reorder_imports: true

use foo::{c, b, a};
use bar;

fn foo() {
bar ( ) ;
Expand All @@ -10,3 +12,11 @@ impl Drop for Context {
fn drop(&mut self) {
}
}

impl Bar for Baz {
fn foo() {
bar(
baz, // Who knows?
)
}
}
12 changes: 11 additions & 1 deletion tests/target/file-lines-item.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// rustfmt-file_lines: [{"file":"tests/source/file-lines-item.rs","range":[5,7]}]
// rustfmt-file_lines: [{"file":"tests/source/file-lines-item.rs","range":[7,9]}]
// rustfmt-reorder_imports: true

use foo::{c, b, a};
use bar;

fn foo() {
bar();
Expand All @@ -10,3 +12,11 @@ impl Drop for Context {
fn drop(&mut self) {
}
}

impl Bar for Baz {
fn foo() {
bar(
baz, // Who knows?
)
}
}