chore(fmt): resolve unary operator formatting issue (noir-lang#3157)

Sakapoi · Oct 19, 2023 · f0ad8ee · f0ad8ee
1 parent 949e56b
commit f0ad8ee
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/tooling/nargo_fmt/src/visitor/expr.rs b/tooling/nargo_fmt/src/visitor/expr.rs
@@ -1,6 +1,6 @@
 use noirc_frontend::{
     hir::resolution::errors::Span, lexer::Lexer, token::Token, ArrayLiteral, BlockExpression,
-    Expression, ExpressionKind, Literal, Statement,
+    Expression, ExpressionKind, Literal, Statement, UnaryOp,
 };
 
 use super::FmtVisitor;
@@ -27,7 +27,20 @@ impl FmtVisitor<'_> {
                 visitor.buffer
             }
             ExpressionKind::Prefix(prefix) => {
-                format!("{}{}", prefix.operator, self.format_expr(prefix.rhs))
+                let op = match prefix.operator {
+                    UnaryOp::Minus => "-",
+                    UnaryOp::Not => "!",
+                    UnaryOp::MutableReference => "&mut ",
+                    UnaryOp::Dereference { implicitly_added } => {
+                        if implicitly_added {
+                            ""
+                        } else {
+                            "*"
+                        }
+                    }
+                };
+
+                format!("{op}{}", self.format_expr(prefix.rhs))
             }
             ExpressionKind::Cast(cast) => {
                 format!("{} as {}", self.format_expr(cast.lhs), cast.r#type)

diff --git a/tooling/nargo_fmt/tests/expected/unary_operators.nr b/tooling/nargo_fmt/tests/expected/unary_operators.nr
@@ -2,4 +2,8 @@ fn main() {
     -1;
     -/*test*/1;
     -/*test*/1;
+
+    &mut 1;
+    *v;
+    ***v;
 }
diff --git a/tooling/nargo_fmt/tests/input/unary_operators.nr b/tooling/nargo_fmt/tests/input/unary_operators.nr
@@ -2,4 +2,8 @@ fn main() {
     -1;
 -/*test*/1;
     -/*test*/1;
+
+    & mut 1;
+    * v;
+    * * * v;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,8 @@ fn main() { @@
         -1;
         -/*test*/1;
         -/*test*/1;
+        &mut 1;
+        *v;
+        ***v;
     }