@@ -2815,7 +2815,7 @@ fn gen_sequence_expr<'a>(node: &'a SeqExpr, context: &mut Context<'a>) -> PrintI
2815
2815
GenSeparatedValuesParams {
2816
2816
nodes : node. exprs . iter ( ) . map ( |x| NodeOrSeparator :: Node ( x. into ( ) ) ) . collect ( ) ,
2817
2817
prefer_hanging : context. config . sequence_expression_prefer_hanging ,
2818
- force_use_new_lines : false ,
2818
+ force_use_new_lines : is_node_definitely_above_line_width ( node . range ( ) , context ) ,
2819
2819
allow_blank_lines : false ,
2820
2820
separator : TrailingCommas :: Never . into ( ) ,
2821
2821
single_line_space_at_start : false ,
@@ -5153,7 +5153,7 @@ fn gen_try_stmt<'a>(node: &'a TryStmt, context: &mut Context<'a>) -> PrintItems
5153
5153
5154
5154
fn gen_var_decl < ' a > ( node : & ' a VarDecl , context : & mut Context < ' a > ) -> PrintItems {
5155
5155
let mut items = PrintItems :: new ( ) ;
5156
- let force_use_new_lines = get_use_new_lines ( & node. decls , context) ;
5156
+ let force_use_new_lines = get_use_new_lines ( node, context) ;
5157
5157
if node. declare ( ) {
5158
5158
items. push_str ( "declare " ) ;
5159
5159
}
@@ -5203,8 +5203,13 @@ fn gen_var_decl<'a>(node: &'a VarDecl, context: &mut Context<'a>) -> PrintItems
5203
5203
}
5204
5204
}
5205
5205
5206
- fn get_use_new_lines < ' a > ( decls : & [ & ' a VarDeclarator ] , context : & mut Context ) -> bool {
5207
- get_use_new_lines_for_nodes ( decls, context. config . variable_statement_prefer_single_line , context)
5206
+ fn get_use_new_lines < ' a > ( node : & VarDecl , context : & mut Context ) -> bool {
5207
+ if get_use_new_lines_for_nodes ( & node. decls , context. config . variable_statement_prefer_single_line , context) {
5208
+ true
5209
+ } else {
5210
+ // probably minified code
5211
+ node. decls . len ( ) >= 2 && is_node_definitely_above_line_width ( node. range ( ) , context)
5212
+ }
5208
5213
}
5209
5214
}
5210
5215
@@ -9382,6 +9387,8 @@ fn is_node_definitely_above_line_width<'a>(range: SourceRange, context: &Context
9382
9387
if count > max_width {
9383
9388
return true ;
9384
9389
}
9390
+ } else if c == '\n' {
9391
+ return false ;
9385
9392
}
9386
9393
}
9387
9394
false
0 commit comments