diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2017-04-06 13:01:19 +1200 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2017-04-06 13:01:19 +1200 |
| commit | f4952d3780761c27cd686244aa490a1e64620e49 (patch) | |
| tree | 0ff3928725ec636d84690457ed2b7aecb4612dbd /src/expr.rs | |
| parent | b3a4ba570e8e5066564c2e9a96cc381a443d544f (diff) | |
Implement a max array width
Fixes #1421
Diffstat (limited to 'src/expr.rs')
| -rw-r--r-- | src/expr.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/expr.rs b/src/expr.rs index b472f283c6c..04634e2645e 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -377,13 +377,18 @@ pub fn rewrite_array<'a, I>(expr_iter: I, IndentStyle::Block => { // FIXME wrong shape in one-line case match shape.width.checked_sub(2 * bracket_size) { - Some(width) => definitive_tactic(&items, ListTactic::HorizontalVertical, width), + Some(width) => { + let tactic = ListTactic::LimitedHorizontalVertical(context.config.array_width); + definitive_tactic(&items, tactic, width) + } None => DefinitiveListTactic::Vertical, } } IndentStyle::Visual => { if has_long_item || items.iter().any(ListItem::is_multiline) { - definitive_tactic(&items, ListTactic::HorizontalVertical, nested_shape.width) + definitive_tactic(&items, + ListTactic::LimitedHorizontalVertical(context.config.array_width), + nested_shape.width) } else { DefinitiveListTactic::Mixed } |
