Skip to content

Commit 113be53

Browse files
committed
Do better at preserving blank lines during pretty-printing
1 parent 8c3ed86 commit 113be53

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

src/comp/syntax/print/pprust.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,11 @@ fn print_comment(s: &ps, cmnt: lexer::cmnt) {
15631563
}
15641564
lexer::blank_line. {
15651565
// We need to do at least one, possibly two hardbreaks.
1566-
if is_begin(s) || is_end(s) { hardbreak(s.s) }
1566+
let is_semi = alt s.s.last_token() {
1567+
pp::STRING(s, _) { s == ";" }
1568+
_ { false }
1569+
};
1570+
if is_semi || is_begin(s) || is_end(s) { hardbreak(s.s) }
15671571
hardbreak(s.s);
15681572
}
15691573
}

src/test/pretty/blank-lines.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// pp-exact
2+
fn f() -> [int] {
3+
let picard = 0;
4+
5+
let data = 1;
6+
7+
let worf = 2;
8+
9+
10+
let enterprise = [picard, data, worf];
11+
12+
13+
14+
ret enterprise;
15+
}

0 commit comments

Comments
 (0)