dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(prettier): print multiple variable declarator correctly in VariableDeclaration (#1485)

Browse source
This commit is contained in:
Dunqing 2023-11-21 18:54:26 +08:00 committed by GitHub
parent f1874c7955
commit 347b5721c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
crates/oxc_prettier/src/format/mod.rs
View file

@ -564,13 +564,27 @@ impl<'a> Format<'a> for VariableDeclaration<'a> {
};
let kind = self.kind.as_str();
let mut decls = p.vec();
decls.extend(self.declarations.iter().map(|decl| decl.format(p)));
let mut parts = p.vec();
parts.push(ss!(kind));
parts.push(ss!(" "));
parts.extend(decls);
let is_hardline = !p.parent_kind().is_iteration_statement()
&& self.declarations.iter().all(|decl| decl.init.is_some());
let decls_len = self.declarations.len();
parts.extend(self.declarations.iter().enumerate().map(|(i, decl)| {
if decls_len > 1 {
let mut d_parts = p.vec();
if i != 0 {
d_parts.push(p.str(","));
d_parts.push(if is_hardline { hardline!() } else { line!() });
}
d_parts.push(decl.format(p));
Doc::Indent(d_parts)
} else {
decl.format(p)
}
}));
if !parent_for_loop.is_some_and(|span| span != self.span) {
parts.push(ss!(";"));