Fix multi assign methods (#218)

Fixes #196
fables-tales · Jul 8, 2020 · ed23d03 · ed23d03
1 parent eedfe21
commit ed23d03
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/fixtures/small/multi_assign_method_actual.rb b/fixtures/small/multi_assign_method_actual.rb
@@ -0,0 +1 @@
+foo.bar = 1,2
diff --git a/fixtures/small/multi_assign_method_expected.rb b/fixtures/small/multi_assign_method_expected.rb
@@ -0,0 +1 @@
+foo.bar = 1, 2
diff --git a/librubyfmt/src/format.rs b/librubyfmt/src/format.rs
@@ -1217,8 +1217,9 @@ pub fn format_assign(ps: &mut ParserState, assign: Assign) {
         ps.emit_op("=".to_string());
         ps.emit_space();
 
-        ps.with_formatting_context(FormattingContext::Assign, |ps| {
-            format_expression(ps, *right);
+        ps.with_formatting_context(FormattingContext::Assign, |ps| match right {
+            ExpressionOrMRHSNewFromArgs::Expression(e) => format_expression(ps, *e),
+            ExpressionOrMRHSNewFromArgs::MRHSNewFromArgs(m) => format_mrhs_new_from_args(ps, m),
         });
     });
 

diff --git a/librubyfmt/src/ripper_tree_types.rs b/librubyfmt/src/ripper_tree_types.rs
@@ -359,7 +359,17 @@ pub enum ArgsAddBlockOrExpressionList {
 
 def_tag!(assign_tag, "assign");
 #[derive(Deserialize, Debug, Clone)]
-pub struct Assign(pub assign_tag, pub Assignable, pub Box<Expression>);
+pub struct Assign(
+    pub assign_tag,
+    pub Assignable,
+    pub ExpressionOrMRHSNewFromArgs,
+);
+
+#[derive(RipperDeserialize, Debug, Clone)]
+pub enum ExpressionOrMRHSNewFromArgs {
+    Expression(Box<Expression>),
+    MRHSNewFromArgs(MRHSNewFromArgs),
+}
 
 def_tag!(massign_tag, "massign");
 #[derive(Deserialize, Debug, Clone)]