chore: Fix undesirable line break before '{' in function signature with comments

tooling/nargo_fmt/src/utils.rs

@@ -89,7 +89,7 @@
         let starts_with_single_line_comment = leading_trimmed.starts_with("//");
 
         if ends_with_block_comment {
             let comment_end = leading_trimmed.rfind(|c| c == '/').unwrap();
 
             if leading[comment_end..].contains('\n') {
                 different_line = true;
@@ -190,7 +190,7 @@
 }
 
 pub(crate) fn count_newlines(slice: &str) -> usize {
     bytecount::count(slice.as_bytes(), b'\n')
 }
 
 pub(crate) trait Item {
@@ -244,3 +244,7 @@
 pub(crate) fn is_single_line(s: &str) -> bool {
     !s.chars().any(|c| c == '\n')
 }
+
+pub(crate) fn last_line_contains_single_line_comment(s: &str) -> bool {
+    s.lines().last().map_or(false, |line| line.contains("//"))
+}

tooling/nargo_fmt/src/visitor/item.rs

@@ -4,11 +4,27 @@ use noirc_frontend::{
     NoirFunction, ParsedModule,
 };
 
+use crate::utils::last_line_contains_single_line_comment;
+
 impl super::FmtVisitor<'_> {
     fn format_fn_before_block(&self, func: NoirFunction, start: u32) -> (String, bool) {
         let slice = self.slice(start..func.span().start());
-        let force_brace_newline = slice.contains("//");
-        (slice.trim_end().to_string(), force_brace_newline)
+
+        let params_open = self
+            .span_before(func.name_ident().span().end()..func.span().start(), Token::LeftParen)
+            .start();
+
+        let last_span = if func.parameters().is_empty() {
+            params_open..func.span().start()
+        } else {
+            func.parameters().last().unwrap().1.span.unwrap().end()..func.span().start()
+        };
+
+        let params_end = self.span_after(last_span, Token::RightParen).start();
+
+        let maybe_comment = self.slice(params_end..func.span().start());
+
+        (slice.trim_end().to_string(), last_line_contains_single_line_comment(maybe_comment))
     }
 
     pub(crate) fn visit_file(&mut self, module: ParsedModule) {

tooling/nargo_fmt/tests/expected/fn.nr

@@ -1 +1,14 @@
 fn main(x: pub u8, y: u8) {}
+
+fn main()
+// hello
+{}
+
+fn main(
+    // hello
+) {}
+
+fn main(
+    // hello
+    unit: ()
+) {}

tooling/nargo_fmt/tests/input/fn.nr

@@ -1 +1,14 @@
 fn main(x: pub u8, y: u8) {}
+
+fn main()
+// hello
+{}
+
+fn main(
+    // hello
+) {}
+
+fn main(
+    // hello
+    unit: ()
+) {}