Skip to content

Commit

Permalink
fix: don't break generic params into mulitple lines (#167)
Browse files Browse the repository at this point in the history
  • Loading branch information
bram209 authored Feb 2, 2025
1 parent 975d7f5 commit cf178b5
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 6 deletions.
23 changes: 23 additions & 0 deletions formatter/src/formatter/element.rs
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,29 @@ mod tests {
insta::assert_snapshot!(formatted, @"<SizeOf<String> />");
}

#[test]
fn with_closing_tag_generics() {
let formatted = format_element! { <SizeOf<String>></SizeOf<String>> };
insta::assert_snapshot!(formatted, @"<SizeOf<String>></SizeOf<String>>");
}

#[test]
fn with_generics_and_attributes() {
let formatted = format_element! { <FormDialog<CreatePost> status="DRAFT" foo={bar} someeeee="looooeeeeeeeeeeeeeeong_attrr">
<Input label="Title" />
</FormDialog<CreatePost>>
};
insta::assert_snapshot!(formatted, @r###"
<FormDialog<CreatePost>
status="DRAFT"
foo=bar
someeeee="looooeeeeeeeeeeeeeeong_attrr"
>
<Input label="Title" />
</FormDialog<CreatePost>>
"###);
}

// Closing Tags Behaviour

#[test]
Expand Down
14 changes: 13 additions & 1 deletion formatter/src/formatter/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,18 @@ impl<'a> Formatter<'a> {
}

pub fn format_syn_generics(&mut self, generics: &Generics) {
leptosfmt_prettyplease::unparse_fn(self.printer, None, |p| p.generics(generics));
if generics.params.is_empty() {
return;
}

self.printer.word("<");
let mut params = generics.params.iter().peekable();
while let Some(param) = params.next() {
leptosfmt_prettyplease::unparse_fn(self.printer, None, |p| p.generic_param(param));
if params.peek().is_some() {
self.printer.word(", ");
}
}
self.printer.word(">");
}
}
2 changes: 1 addition & 1 deletion prettyplease
Submodule prettyplease updated 1 files
+1 −1 src/generics.rs
4 changes: 0 additions & 4 deletions printer/src/ring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ impl<T> RingBuffer<T> {
self.data.clear();
}

pub fn index_of_first(&self) -> usize {
self.offset
}

pub fn index_range(&self) -> Range<usize> {
self.offset..self.offset + self.data.len()
}
Expand Down

0 comments on commit cf178b5

Please sign in to comment.