fix: format global attributes (#7401)

noir-lang · Feb 14, 2025 · b7ace68 · b7ace68 · github-actions · Feb 14, 2025
1 parent b2b632b
commit b7ace68
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/test_programs/compile_success_contract/abi_attribute/src/main.nr b/test_programs/compile_success_contract/abi_attribute/src/main.nr
@@ -4,6 +4,6 @@ contract Foo {
 
     #[abi(bar)]
     pub struct Bar {
-        inner: Field
+        inner: Field,
     }
 }
diff --git a/test_programs/compile_success_contract/contract_with_impl/src/main.nr b/test_programs/compile_success_contract/contract_with_impl/src/main.nr
@@ -1,5 +1,7 @@
 contract Foo {
-    pub struct T { x: [Field] }
+    pub struct T {
+        x: [Field],
+    }
 
     impl T {
         fn t(self) {

diff --git a/test_programs/compile_success_contract/non_entry_point_method/src/main.nr b/test_programs/compile_success_contract/non_entry_point_method/src/main.nr
@@ -1,5 +1,7 @@
 contract Foo {
-    pub struct PlaceholderStruct{x : u32 }
+    pub struct PlaceholderStruct {
+        x: u32,
+    }
 
     #[contract_library_method]
     pub fn has_mut(_context: &mut PlaceholderStruct) {}

diff --git a/test_programs/format.sh b/test_programs/format.sh
@@ -33,7 +33,7 @@ echo "[workspace]" > Nargo.toml
 echo "members = [" >> Nargo.toml
 
 collect_dirs compile_success_empty
-# collect_dirs compile_success_contract
+collect_dirs compile_success_contract
 collect_dirs compile_success_no_bug
 collect_dirs compile_success_with_bug
 collect_dirs execution_success

diff --git a/tooling/nargo_fmt/src/formatter/global.rs b/tooling/nargo_fmt/src/formatter/global.rs
@@ -12,6 +12,8 @@ impl<'a> Formatter<'a> {
         let_statement: LetStatement,
         visibility: ItemVisibility,
     ) {
+        self.format_secondary_attributes(let_statement.attributes.clone());
+
         let group = self.chunk_formatter().format_global(let_statement, visibility);
         self.write_indentation();
         self.format_chunk_group(group);
@@ -99,4 +101,13 @@ mod tests {
         let expected = "pub comptime mut global x: Field = 1;\n";
         assert_format(src, expected);
     }
+
+    #[test]
+    fn format_global_with_attributes() {
+        let src = " #[abi ( foo ) ]  global  x  =  1  ; ";
+        let expected = "#[abi(foo)]
+global x = 1;
+";
+        assert_format(src, expected);
+    }
 }