Introduce ChunkGroup::space

noir-lang · Oct 19, 2024 · 89a5a7e · 89a5a7e
1 parent cb299e5
commit 89a5a7e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/tooling/nargo_fmt/src/formatter/chunks.rs b/tooling/nargo_fmt/src/formatter/chunks.rs
@@ -195,9 +195,16 @@ impl ChunkGroup {
         }
     }
 
-    /// Appends a semicolon to this group. This will actually end up attaching the
-    /// semicolon to the last text in this group so that we don't end up with
-    /// stray semicolons.
+    /// Appends a single space to this group by reading it from the given formatter.
+    pub(crate) fn space(&mut self, formatter: &mut Formatter<'_>) {
+        self.text(formatter.chunk(|formatter| {
+            formatter.write_space();
+        }));
+    }
+
+    /// Appends a semicolon to this group by reading it from the given formatter.
+    /// This will actually end up attaching the semicolon to the last text in this
+    /// group so that we don't end up with stray semicolons.
     pub(crate) fn semicolon(&mut self, formatter: &mut Formatter<'_>) {
         self.text_attached_to_last_group(formatter.chunk(|formatter| {
             formatter.write_semicolon();

diff --git a/tooling/nargo_fmt/src/formatter/expression.rs b/tooling/nargo_fmt/src/formatter/expression.rs
@@ -157,9 +157,7 @@ impl<'a> Formatter<'a> {
 
                 self.format_expression(*repeated_element, &mut group);
                 group.semicolon(self);
-                group.text(self.chunk(|formatter| {
-                    formatter.write_space();
-                }));
+                group.space(self);
                 self.format_expression(*length, &mut group);
 
                 group.decrease_indentation();
@@ -778,9 +776,7 @@ impl<'a> Formatter<'a> {
             *force_multiple_lines = true;
             group.trailing_comment(comment_chunk_after_condition);
         } else {
-            group.text(self.chunk(|formatter| {
-                formatter.write_space();
-            }));
+            group.space(self);
         }
 
         let ExpressionKind::Block(consequence_block) = if_expression.consequence.kind else {
@@ -817,9 +813,7 @@ impl<'a> Formatter<'a> {
                 *force_multiple_lines = true;
                 group.trailing_comment(comment_chunk_after_else);
             } else {
-                group.text(self.chunk(|formatter| {
-                    formatter.write_space();
-                }));
+                group.space(self);
             }
 
             let mut alternative_group = match alternative.kind {

diff --git a/tooling/nargo_fmt/src/formatter/statement.rs b/tooling/nargo_fmt/src/formatter/statement.rs
@@ -235,9 +235,7 @@ impl<'a> Formatter<'a> {
             }
         }
 
-        group.text(self.chunk(|formatter| {
-            formatter.write_space();
-        }));
+        group.space(self);
 
         let ExpressionKind::Block(block) = for_loop.block.kind else {
             panic!("Expected a block expression for for loop body");