From 1b5dabc89a47b95b038edebb4854cc020b87df36 Mon Sep 17 00:00:00 2001
From: f01dab1e <andriy.n@obox.systems>
Date: Wed, 8 Nov 2023 12:43:28 +0000
Subject: [PATCH] fix

---
 tooling/nargo_fmt/src/rewrite/infix.rs   | 22 +++-------------------
 tooling/nargo_fmt/tests/expected/expr.nr |  3 +--
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/tooling/nargo_fmt/src/rewrite/infix.rs b/tooling/nargo_fmt/src/rewrite/infix.rs
index c7f14af0351..0fbfa07a841 100644
--- a/tooling/nargo_fmt/src/rewrite/infix.rs
+++ b/tooling/nargo_fmt/src/rewrite/infix.rs
@@ -5,15 +5,12 @@ use noirc_frontend::{Expression, ExpressionKind};
 use crate::{
     utils::{first_line_width, is_single_line},
     visitor::{ExpressionType, FmtVisitor, Shape},
-    Config,
 };
 
 pub(crate) fn rewrite(visitor: FmtVisitor, expr: Expression, shape: Shape) -> String {
     match flatten(visitor.fork(), &expr) {
-        Some((exprs, separators)) => {
-            rewrite_single_line(visitor.config, shape, &exprs, &separators)
-                .unwrap_or_else(|| rewrite_multiline(visitor, &exprs, &separators))
-        }
+        Some((exprs, separators)) => rewrite_single_line(shape, &exprs, &separators)
+            .unwrap_or_else(|| rewrite_multiline(visitor, &exprs, &separators)),
         None => {
             let ExpressionKind::Infix(infix) = expr.kind else { unreachable!() };
 
@@ -27,12 +24,7 @@ pub(crate) fn rewrite(visitor: FmtVisitor, expr: Expression, shape: Shape) -> St
     }
 }
 
-fn rewrite_single_line(
-    config: &Config,
-    shape: Shape,
-    exprs: &[String],
-    separators: &[String],
-) -> Option<String> {
+fn rewrite_single_line(shape: Shape, exprs: &[String], separators: &[String]) -> Option<String> {
     let mut result = String::new();
 
     for (rewrite, separator) in zip(exprs, separators) {
@@ -46,8 +38,6 @@ fn rewrite_single_line(
         result.push(' ');
     }
 
-    let prefix_len = result.len();
-
     let last = exprs.last().unwrap();
     result.push_str(last);
 
@@ -55,12 +45,6 @@ fn rewrite_single_line(
         return None;
     }
 
-    if !(is_single_line(&result) || last.starts_with('{'))
-        && (last.starts_with('(') || prefix_len > config.tab_spaces)
-    {
-        return None;
-    }
-
     result.into()
 }
 
diff --git a/tooling/nargo_fmt/tests/expected/expr.nr b/tooling/nargo_fmt/tests/expected/expr.nr
index f9190beb803..03a26835ee3 100644
--- a/tooling/nargo_fmt/tests/expected/expr.nr
+++ b/tooling/nargo_fmt/tests/expected/expr.nr
@@ -100,8 +100,7 @@ fn parenthesized() {
 }
 
 fn parenthesized() {
-    value
-        + (
+    value + (
             // line
             x as Field
         )