Skip to content

Commit

Permalink
modify rewrite_struct_lit, rewrite_struct_pat
Browse files Browse the repository at this point in the history 
- refactor rewrite_*** functions that call rewrite_path to return RewriteResult
- modify rewrite_aligned_item method of AlignedItem
  • Loading branch information
@ding-young @ytmimi
ding-young authored and ytmimi committed Jul 18, 2024
1 parent 3cbc91e commit babc2f9
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 45 deletions.
62 changes: 34 additions & 28 deletions src/expr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ pub(crate) fn format_expr(
expr.span,
shape,
)
.ok()
}
ast::ExprKind::Tup(ref items) => {
rewrite_tuple(context, items.iter(), expr.span, shape, items.len() == 1)
Expand Down Expand Up @@ -1603,7 +1604,7 @@ fn rewrite_struct_lit<'a>(
attrs: &[ast::Attribute],
span: Span,
shape: Shape,
) -> Option<String> {
) -> RewriteResult {
debug!("rewrite_struct_lit: shape {:?}", shape);

enum StructLitField<'a> {
Expand All @@ -1613,20 +1614,21 @@ fn rewrite_struct_lit<'a>(
}

// 2 = " {".len()
let path_shape = shape.sub_width(2)?;
let path_str = rewrite_path(context, PathContext::Expr, qself, path, path_shape).ok()?;
let path_shape = shape.sub_width(2).max_width_error(shape.width, span)?;
let path_str = rewrite_path(context, PathContext::Expr, qself, path, path_shape)?;

let has_base_or_rest = match struct_rest {
ast::StructRest::None if fields.is_empty() => return Some(format!("{path_str} {{}}")),
ast::StructRest::None if fields.is_empty() => return Ok(format!("{path_str} {{}}")),
ast::StructRest::Rest(_) if fields.is_empty() => {
return Some(format!("{path_str} {{ .. }}"));
return Ok(format!("{path_str} {{ .. }}"));
}
ast::StructRest::Rest(_) | ast::StructRest::Base(_) => true,
_ => false,
};

// Foo { a: Foo } - indent is +3, width is -5.
let (h_shape, v_shape) = struct_lit_shape(shape, context, path_str.len() + 3, 2)?;
let (h_shape, v_shape) = struct_lit_shape(shape, context, path_str.len() + 3, 2)
.max_width_error(shape.width, span)?;

let one_line_width = h_shape.map_or(0, |shape| shape.width);
let body_lo = context.snippet_provider.span_after(span, "{");
Expand All @@ -1639,7 +1641,8 @@ fn rewrite_struct_lit<'a>(
v_shape,
mk_sp(body_lo, span.hi()),
one_line_width,
)?
)
.unknown_error()?
} else {
let field_iter = fields.iter().map(StructLitField::Regular).chain(
match struct_rest {
Expand Down Expand Up @@ -1668,12 +1671,13 @@ fn rewrite_struct_lit<'a>(
let rewrite = |item: &StructLitField<'_>| match *item {
StructLitField::Regular(field) => {
// The 1 taken from the v_budget is for the comma.
rewrite_field(context, field, v_shape.sub_width(1)?, 0)
let v_shape = v_shape.sub_width(1)?;
rewrite_field(context, field, v_shape, 0).ok()
}
StructLitField::Base(expr) => {
// 2 = ..
expr.rewrite(context, v_shape.offset_left(2)?)
.map(|s| format!("..{}", s))
let v_shape = v_shape.sub_width(2)?;
expr.rewrite(context, v_shape).map(|s| format!("..{}", s))
}
StructLitField::Rest(_) => Some("..".to_owned()),
};
Expand Down Expand Up @@ -1705,12 +1709,12 @@ fn rewrite_struct_lit<'a>(
force_no_trailing_comma || has_base_or_rest || !context.use_block_indent(),
);

write_list(&item_vec, &fmt)?
write_list(&item_vec, &fmt).unknown_error()?
};

let fields_str =
wrap_struct_field(context, attrs, &fields_str, shape, v_shape, one_line_width)?;
Some(format!("{path_str} {{{fields_str}}}"))
Ok(format!("{path_str} {{{fields_str}}}"))

// FIXME if context.config.indent_style() == Visual, but we run out
// of space, we should fall back to BlockIndent.
Expand All @@ -1723,7 +1727,7 @@ pub(crate) fn wrap_struct_field(
shape: Shape,
nested_shape: Shape,
one_line_width: usize,
) -> Option<String> {
) -> RewriteResult {
let should_vertical = context.config.indent_style() == IndentStyle::Block
&& (fields_str.contains('\n')
|| !context.config.struct_lit_single_line()
Expand All @@ -1732,21 +1736,21 @@ pub(crate) fn wrap_struct_field(
let inner_attrs = &inner_attributes(attrs);
if inner_attrs.is_empty() {
if should_vertical {
Some(format!(
Ok(format!(
"{}{}{}",
nested_shape.indent.to_string_with_newline(context.config),
fields_str,
shape.indent.to_string_with_newline(context.config)
))
} else {
// One liner or visual indent.
Some(format!(" {fields_str} "))
Ok(format!(" {fields_str} "))
}
} else {
Some(format!(
Ok(format!(
"{}{}{}{}{}",
nested_shape.indent.to_string_with_newline(context.config),
inner_attrs.rewrite(context, shape)?,
inner_attrs.rewrite_result(context, shape)?,
nested_shape.indent.to_string_with_newline(context.config),
fields_str,
shape.indent.to_string_with_newline(context.config)
Expand All @@ -1763,38 +1767,40 @@ pub(crate) fn rewrite_field(
field: &ast::ExprField,
shape: Shape,
prefix_max_width: usize,
) -> Option<String> {
) -> RewriteResult {
if contains_skip(&field.attrs) {
return Some(context.snippet(field.span()).to_owned());
return Ok(context.snippet(field.span()).to_owned());
}
let mut attrs_str = field.attrs.rewrite(context, shape)?;
let mut attrs_str = field.attrs.rewrite_result(context, shape)?;
if !attrs_str.is_empty() {
attrs_str.push_str(&shape.indent.to_string_with_newline(context.config));
};
let name = context.snippet(field.ident.span);
if field.is_shorthand {
Some(attrs_str + name)
Ok(attrs_str + name)
} else {
let mut separator = String::from(struct_lit_field_separator(context.config));
for _ in 0..prefix_max_width.saturating_sub(name.len()) {
separator.push(' ');
}
let overhead = name.len() + separator.len();
let expr_shape = shape.offset_left(overhead)?;
let expr = field.expr.rewrite(context, expr_shape);
let expr_shape = shape
.offset_left(overhead)
.max_width_error(shape.width, field.span)?;
let expr = field.expr.rewrite_result(context, expr_shape);
let is_lit = matches!(field.expr.kind, ast::ExprKind::Lit(_));
match expr {
Some(ref e)
Ok(ref e)
if !is_lit && e.as_str() == name && context.config.use_field_init_shorthand() =>
{
Some(attrs_str + name)
Ok(attrs_str + name)
}
Some(e) => Some(format!("{attrs_str}{name}{separator}{e}")),
None => {
Ok(e) => Ok(format!("{attrs_str}{name}{separator}{e}")),
Err(_) => {
let expr_offset = shape.indent.block_indent(context.config);
let expr = field
.expr
.rewrite(context, Shape::indented(expr_offset, context.config));
.rewrite_result(context, Shape::indented(expr_offset, context.config));
expr.map(|s| {
format!(
"{}{}:\n{}{}",
Expand Down
20 changes: 11 additions & 9 deletions src/patterns.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::lists::{
use crate::macros::{rewrite_macro, MacroPosition};
use crate::overflow;
use crate::pairs::{rewrite_pair, PairParts};
use crate::rewrite::{Rewrite, RewriteContext};
use crate::rewrite::{Rewrite, RewriteContext, RewriteErrorExt, RewriteResult};
use crate::shape::Shape;
use crate::source_map::SpanUtils;
use crate::spanned::Spanned;
Expand Down Expand Up @@ -292,7 +292,8 @@ impl Rewrite for Pat {
self.span,
context,
shape,
),
)
.ok(),
PatKind::MacCall(ref mac) => {
rewrite_macro(mac, None, context, shape, MacroPosition::Pat)
}
Expand All @@ -313,20 +314,21 @@ fn rewrite_struct_pat(
span: Span,
context: &RewriteContext<'_>,
shape: Shape,
) -> Option<String> {
) -> RewriteResult {
// 2 = ` {`
let path_shape = shape.sub_width(2)?;
let path_str = rewrite_path(context, PathContext::Expr, qself, path, path_shape).ok()?;
let path_shape = shape.sub_width(2).max_width_error(shape.width, span)?;
let path_str = rewrite_path(context, PathContext::Expr, qself, path, path_shape)?;

if fields.is_empty() && !ellipsis {
return Some(format!("{path_str} {{}}"));
return Ok(format!("{path_str} {{}}"));
}

let (ellipsis_str, terminator) = if ellipsis { (", ..", "..") } else { ("", "}") };

// 3 = ` { `, 2 = ` }`.
let (h_shape, v_shape) =
struct_lit_shape(shape, context, path_str.len() + 3, ellipsis_str.len() + 2)?;
struct_lit_shape(shape, context, path_str.len() + 3, ellipsis_str.len() + 2)
.max_width_error(shape.width, span)?;

let items = itemize_list(
context.snippet_provider,
Expand All @@ -352,7 +354,7 @@ fn rewrite_struct_pat(
let nested_shape = shape_for_tactic(tactic, h_shape, v_shape);
let fmt = struct_lit_formatting(nested_shape, tactic, context, false);

let mut fields_str = write_list(&item_vec, &fmt)?;
let mut fields_str = write_list(&item_vec, &fmt).unknown_error()?;
let one_line_width = h_shape.map_or(0, |shape| shape.width);

let has_trailing_comma = fmt.needs_trailing_separator();
Expand Down Expand Up @@ -380,7 +382,7 @@ fn rewrite_struct_pat(

// ast::Pat doesn't have attrs so use &[]
let fields_str = wrap_struct_field(context, &[], &fields_str, shape, v_shape, one_line_width)?;
Some(format!("{path_str} {{{fields_str}}}"))
Ok(format!("{path_str} {{{fields_str}}}"))
}

impl Rewrite for PatField {
Expand Down
21 changes: 13 additions & 8 deletions src/vertical.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::items::{rewrite_struct_field, rewrite_struct_field_prefix};
use crate::lists::{
definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator,
};
use crate::rewrite::{Rewrite, RewriteContext};
use crate::rewrite::{Rewrite, RewriteContext, RewriteResult};
use crate::shape::{Indent, Shape};
use crate::source_map::SpanUtils;
use crate::spanned::Spanned;
Expand All @@ -30,7 +30,7 @@ pub(crate) trait AlignedItem {
context: &RewriteContext<'_>,
shape: Shape,
prefix_max_width: usize,
) -> Option<String>;
) -> RewriteResult;
}

impl AlignedItem for ast::FieldDef {
Expand Down Expand Up @@ -66,8 +66,8 @@ impl AlignedItem for ast::FieldDef {
context: &RewriteContext<'_>,
shape: Shape,
prefix_max_width: usize,
) -> Option<String> {
rewrite_struct_field(context, self, shape, prefix_max_width).ok()
) -> RewriteResult {
rewrite_struct_field(context, self, shape, prefix_max_width)
}
}

Expand Down Expand Up @@ -103,7 +103,7 @@ impl AlignedItem for ast::ExprField {
context: &RewriteContext<'_>,
shape: Shape,
prefix_max_width: usize,
) -> Option<String> {
) -> RewriteResult {
rewrite_field(context, self, shape, prefix_max_width)
}
}
Expand Down Expand Up @@ -228,7 +228,11 @@ fn rewrite_aligned_items_inner<T: AlignedItem>(
",",
|field| field.get_span().lo(),
|field| field.get_span().hi(),
|field| field.rewrite_aligned_item(context, item_shape, field_prefix_max_width),
|field| {
field
.rewrite_aligned_item(context, item_shape, field_prefix_max_width)
.ok()
},
span.lo(),
span.hi(),
false,
Expand All @@ -244,8 +248,9 @@ fn rewrite_aligned_items_inner<T: AlignedItem>(

if tactic == DefinitiveListTactic::Horizontal {
// since the items fits on a line, there is no need to align them
let do_rewrite =
|field: &T| -> Option<String> { field.rewrite_aligned_item(context, item_shape, 0) };
let do_rewrite = |field: &T| -> Option<String> {
field.rewrite_aligned_item(context, item_shape, 0).ok()
};
fields
.iter()
.zip(items.iter_mut())
Expand Down

0 comments on commit babc2f9

Please sign in to comment.