Merge #856

856: fix: Keep type field arguments on the same line as the name r=Marwes a=Marwes

bors r+

Co-authored-by: Markus Westerlind <[email protected]>

Author: bors[bot]

base/src/types/mod.rs

@@ -2833,11 +2833,13 @@ where
             }
 
             let f = chain![arena;
-                field.name.as_ref(),
-                arena.line(),
-                arena.concat(field.typ.params().iter().map(|param| {
-                    arena.text(param.id.as_ref()).append(arena.line())
-                })),
+                chain![arena;
+                    field.name.as_ref(),
+                    arena.line(),
+                    arena.concat(field.typ.params().iter().map(|param| {
+                        arena.text(param.id.as_ref()).append(arena.line())
+                    }))
+                ].group(),
                 arena.text("= "),
                 if filter == Filter::RetainKey {
                     arena.text("...")

base/tests/types.rs

@@ -102,6 +102,7 @@ fn show_record_multifield() {
     );
     assert_eq_display!(format!("{}", typ), "{ Test a = a -> String, x : Int }");
 }
+
 #[test]
 fn show_record_multiline() {
     let data = |s, a| ArcType::from(type_con(s, a));
@@ -140,6 +141,44 @@ fn show_record_multiline() {
     );
 }
 
+#[test]
+fn show_record_long_type() {
+    let data = |s, a| ArcType::from(type_con(s, a));
+    let fun = Type::function(
+        vec![
+            data(
+                "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+                vec![],
+            ),
+            data("a", vec![]),
+            data("a", vec![]),
+        ],
+        Type::string(),
+    );
+    let test = data("Test", vec![data("a", vec![])]);
+    let record = Type::record(
+        vec![Field::new(
+            "Test",
+            Alias::from(AliasData::new(
+                "Test",
+                vec![Generic::new("a", Kind::typ())],
+                fun.clone(),
+            )),
+        )],
+        vec![],
+    );
+
+    assert_eq_display!(
+        format!("{}", record),
+        r#"{
+    Test a = aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+        -> a
+        -> a
+        -> String
+}"#
+    );
+}
+
 #[test]
 fn show_record_filtered() {
     let data = |s, a| ArcType::from(type_con(s, a));
@@ -262,10 +301,7 @@ fn show_record_multi_line_nested() {
 #[test]
 fn show_variant() {
     let typ: ArcType<&str> = Type::variant(vec![
-        Field::new(
-            "A",
-            Type::function(vec![Type::int()], Type::opaque()),
-        ),
+        Field::new("A", Type::function(vec![Type::int()], Type::opaque())),
         Field::new("B", Type::opaque()),
     ]);
     assert_eq_display!(format!("{}", typ), "| A Int\n| B");