Skip to content

Commit a8ff3b8

Browse files
committed
make palceholders less sticky
1 parent 860581a commit a8ff3b8

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/format.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,9 @@ impl<'a> Formatter<'a> {
631631
);
632632
self.format_words(&m.operands, true, depth);
633633
}
634-
Word::Placeholder(sig) => self.format_signature('^', *sig, false),
634+
Word::Placeholder(sig) => {
635+
self.format_signature('^', *sig, word.span.as_str().ends_with(' '))
636+
}
635637
Word::Spaces => self.push(&word.span, " "),
636638
Word::Comment(comment) => {
637639
let beginning_of_line = self

src/parse.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,10 @@ impl Parser {
327327
let start = self.try_exact(initial_token)?;
328328
self.try_spaces();
329329
let (args, outs) = self.sig_inner();
330-
let end = self.prev_span();
331-
self.try_spaces();
330+
let mut end = self.prev_span();
331+
if let Some(sp) = self.try_spaces() {
332+
end = sp.span;
333+
}
332334
let span = start.merge(end);
333335
Some(span.sp(Signature::new(args, outs)))
334336
}

0 commit comments

Comments
 (0)