feat(fmt): ternary expression (foundry-rs#2120)

* ternary expr * upd readme
t-proctor · Jun 25, 2022 · d06692d · d06692d
1 parent e3afcd9
commit d06692d
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 1 deletion.
diff --git a/fmt/README.md b/fmt/README.md
@@ -57,7 +57,7 @@ See [Expression](https://github.com/hyperledger-labs/solang/blob/413841b5c759eb8
 - [ ] NamedFunctionCall
 - [x] New
 - [x] Delete
-- [ ] Ternary
+- [x] Ternary
 - [x] Type
     - [x] Address
     - [x] Address Payable

diff --git a/fmt/src/formatter.rs b/fmt/src/formatter.rs
@@ -1536,6 +1536,31 @@ impl<'a, W: Write> Visitor for Formatter<'a, W> {
                     Ok(())
                 })?;
             }
+            Expression::Ternary(loc, cond, first_expr, second_expr) => {
+                let mut chunks = vec![];
+
+                chunks.push(
+                    self.chunked(loc.start(), Some(first_expr.loc().start()), |fmt| {
+                        cond.visit(fmt)
+                    })?,
+                );
+                chunks.push(self.chunked(
+                    first_expr.loc().start(),
+                    Some(second_expr.loc().start()),
+                    |fmt| {
+                        write_chunk!(fmt, "?")?;
+                        first_expr.visit(fmt)
+                    },
+                )?);
+                chunks.push(self.chunked(second_expr.loc().start(), Some(loc.end()), |fmt| {
+                    write_chunk!(fmt, ":")?;
+                    second_expr.visit(fmt)
+                })?);
+
+                if !self.try_on_single_line(|fmt| fmt.write_chunks_separated(&chunks, "", false))? {
+                    self.grouped(|fmt| fmt.write_chunks_separated(&chunks, "", true))?;
+                }
+            }
             Expression::Variable(ident) => {
                 write_chunk!(self, loc.end(), "{}", ident.name)?;
             }
@@ -2773,4 +2798,5 @@ mod tests {
     test_directory! { RevertNamedArgsStatement }
     test_directory! { ReturnStatement }
     test_directory! { TryStatement }
+    test_directory! { TernaryExpression }
 }
diff --git a/fmt/testdata/TernaryExpression/fmt.sol b/fmt/testdata/TernaryExpression/fmt.sol
@@ -0,0 +1,23 @@
+contract TernaryExpression {
+    function test() external {
+        bool condition;
+        bool someVeryVeryLongConditionUsedInTheTernaryExpression;
+
+        condition ? 0 : 1;
+
+        someVeryVeryLongConditionUsedInTheTernaryExpression
+            ? 1234567890
+            : 987654321;
+
+        condition /* comment1 */ /* comment2 */
+            ? 1001 /* comment3 */ /* comment4 */
+            : 2002;
+
+        // comment5
+        someVeryVeryLongConditionUsedInTheTernaryExpression
+            ? 1
+            // comment6
+            // comment7
+            : 0; // comment8
+    }
+}
diff --git a/fmt/testdata/TernaryExpression/original.sol b/fmt/testdata/TernaryExpression/original.sol
@@ -0,0 +1,19 @@
+contract TernaryExpression {
+    function test() external {
+        bool condition;
+        bool someVeryVeryLongConditionUsedInTheTernaryExpression;
+
+        condition ? 0 : 1;
+
+        someVeryVeryLongConditionUsedInTheTernaryExpression ? 1234567890 : 987654321;
+
+        condition /* comment1 */ ? /* comment2 */ 1001 /* comment3 */ : /* comment4 */ 2002;
+
+        // comment5
+        someVeryVeryLongConditionUsedInTheTernaryExpression ? 1
+        // comment6
+        :
+        // comment7
+        0; // comment8
+    }
+}