Add expr formatting to sway-fmt-v2

sway-fmt-v2/Cargo.toml

@@ -21,3 +21,8 @@ sway-parse = { version = "0.19.2", path = "../sway-parse" }
 sway-types = { version = "0.19.2", path = "../sway-types" }
 thiserror = "1.0.30"
 toml = "0.5"
+
+[dev-dependencies]
+forc-util = { path = "../forc-util" }
+paste = "1.0"
+prettydiff = "0.6"

sway-fmt-v2/src/config/comments.rs

@@ -3,7 +3,7 @@ use crate::constants::DEFAULT_MAX_COMMENT_WIDTH;
 
 use super::user_opts::CommentsOptions;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Comments {
     /// Break comments to fit on the line.
     pub wrap_comments: bool,

sway-fmt-v2/src/config/heuristics.rs

@@ -1,12 +1,12 @@
 //! Configuration options related to heuristics.
 use crate::constants::{
-    DEFAULT_ARRAY_WIDTH, DEFAULT_ATTR_FN_LIKE_WIDTH, DEFAULT_CHAIN_WIDTH, DEFAULT_FN_CALL_WIDTH,
-    DEFAULT_MAX_LINE_WIDTH, DEFAULT_SINGLE_LINE_IF_ELSE_WIDTH, DEFAULT_STRUCTURE_LIT_WIDTH,
-    DEFAULT_STRUCTURE_VAR_WIDTH,
+    DEFAULT_ATTR_FN_LIKE_WIDTH, DEFAULT_CHAIN_WIDTH, DEFAULT_COLLECTION_WIDTH,
+    DEFAULT_FN_CALL_WIDTH, DEFAULT_MAX_LINE_WIDTH, DEFAULT_SINGLE_LINE_IF_ELSE_WIDTH,
+    DEFAULT_STRUCTURE_LIT_WIDTH, DEFAULT_STRUCTURE_VAR_WIDTH,
 };
 use serde::{Deserialize, Serialize};
 
-use super::{user_opts::HeuristicsOptions, whitespace::Whitespace};
+use super::user_opts::HeuristicsOptions;
 
 #[derive(Debug, Copy, Clone)]
 pub struct Heuristics {
@@ -51,17 +51,17 @@ pub enum HeuristicsPreferences {
 }
 
 impl HeuristicsPreferences {
-    pub fn to_width_heuristics(self, ws_opts: &Whitespace) -> WidthHeuristics {
+    pub fn to_width_heuristics(self, max_width: usize) -> WidthHeuristics {
         match self {
             HeuristicsPreferences::Off => WidthHeuristics::off(),
-            HeuristicsPreferences::Max => WidthHeuristics::max(ws_opts.max_width),
-            HeuristicsPreferences::Scaled => WidthHeuristics::scaled(ws_opts.max_width),
+            HeuristicsPreferences::Max => WidthHeuristics::max(max_width),
+            HeuristicsPreferences::Scaled => WidthHeuristics::scaled(max_width),
         }
     }
 }
 
 /// 'small' heuristic values
-#[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Copy)]
+#[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Eq, Copy)]
 pub struct WidthHeuristics {
     // Maximum width of the args of a function call before falling back
     // to vertical formatting.
@@ -72,25 +72,19 @@ pub struct WidthHeuristics {
     // Maximum width in the body of a user-defined structure literal before falling back to
     // vertical formatting.
     pub(crate) structure_lit_width: usize,
-    // Maximum width in the body of a user-defined structure field before falling back
+    // Maximum width of a user-defined structure field before falling back
     // to vertical formatting.
     pub(crate) structure_field_width: usize,
-    // Maximum width of an array literal before falling back to vertical
+    // Maximum width of a collection literal before falling back to vertical
     // formatting.
-    pub(crate) array_width: usize,
+    pub(crate) collection_width: usize,
     // Maximum length of a chain to fit on a single line.
     pub(crate) chain_width: usize,
     // Maximum line length for single line if-else expressions. A value
     // of zero means always break if-else expressions.
     pub(crate) single_line_if_else_max_width: usize,
 }
 
-impl std::fmt::Display for WidthHeuristics {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{:?}", self)
-    }
-}
-
 impl WidthHeuristics {
     /// Using this WidthHeuristics means we ignore heuristics.
     pub fn off() -> WidthHeuristics {
@@ -99,7 +93,7 @@ impl WidthHeuristics {
             attr_fn_like_width: usize::max_value(),
             structure_lit_width: 0,
             structure_field_width: 0,
-            array_width: usize::max_value(),
+            collection_width: usize::max_value(),
             chain_width: usize::max_value(),
             single_line_if_else_max_width: 0,
         }
@@ -111,7 +105,7 @@ impl WidthHeuristics {
             attr_fn_like_width: max_width,
             structure_lit_width: max_width,
             structure_field_width: max_width,
-            array_width: max_width,
+            collection_width: max_width,
             chain_width: max_width,
             single_line_if_else_max_width: max_width,
         }
@@ -135,7 +129,7 @@ impl WidthHeuristics {
                 as usize,
             structure_field_width: (DEFAULT_STRUCTURE_VAR_WIDTH as f32 * max_width_ratio).round()
                 as usize,
-            array_width: (DEFAULT_ARRAY_WIDTH as f32 * max_width_ratio).round() as usize,
+            collection_width: (DEFAULT_COLLECTION_WIDTH as f32 * max_width_ratio).round() as usize,
             chain_width: (DEFAULT_CHAIN_WIDTH as f32 * max_width_ratio).round() as usize,
             single_line_if_else_max_width: (DEFAULT_SINGLE_LINE_IF_ELSE_WIDTH as f32
                 * max_width_ratio)
@@ -144,10 +138,8 @@ impl WidthHeuristics {
     }
 }
 
-impl ::std::str::FromStr for WidthHeuristics {
-    type Err = &'static str;
-
-    fn from_str(_: &str) -> Result<Self, Self::Err> {
-        Err("WidthHeuristics is not parsable")
+impl Default for WidthHeuristics {
+    fn default() -> Self {
+        Self::scaled(100)
     }
 }

sway-fmt-v2/src/config/manifest.rs

@@ -14,7 +14,7 @@ use crate::{
 };
 
 /// A finalized `swayfmt` config.
-#[derive(Debug, Default)]
+#[derive(Debug, Default, Clone)]
 pub struct Config {
     pub whitespace: Whitespace,
     pub imports: Imports,

sway-fmt-v2/src/config/ordering.rs

@@ -2,7 +2,7 @@
 
 use super::user_opts::OrderingOptions;
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Ordering {
     /// Reorder import and extern crate statements alphabetically.
     pub reorder_imports: bool,

sway-fmt-v2/src/config/user_def.rs

@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 use super::user_opts::StructuresOptions;
 
 /// Styling preferences for user-defined structures like `struct`s or `enum`s.
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct Structures {
     /// Align fields of user-defined structures if their diffs fit within threshold.
     pub field_alignment: FieldAlignment,

sway-fmt-v2/src/constants.rs

@@ -16,10 +16,10 @@ pub const DEFAULT_FN_CALL_WIDTH: usize = 60;
 pub const DEFAULT_ATTR_FN_LIKE_WIDTH: usize = 70;
 /// Default max width in the body of a user-defined structure literal before falling back to vertical formatting.
 pub const DEFAULT_STRUCTURE_LIT_WIDTH: usize = 18;
-/// Default max width in the body of a user-defined structure field before falling back to vertical formatting.
+/// Default max width of a user-defined structure field before falling back to vertical formatting.
 pub const DEFAULT_STRUCTURE_VAR_WIDTH: usize = 35;
 /// Default Maximum width of an array literal before falling back to vertical formatting.
-pub const DEFAULT_ARRAY_WIDTH: usize = 60;
+pub const DEFAULT_COLLECTION_WIDTH: usize = 60;
 /// Defalt width threshold for an array element to be considered short.
 pub const DEFAULT_SHORT_ARRAY_ELEM_WIDTH_THRESHOLD: usize = 10;
 /// Default max length of a chain to fit on a single line.