sway-fmt-v2 formatting should use tokens directly from sway-parse

sway-fmt-v2/src/items/item_enum.rs

@@ -5,7 +5,7 @@ use crate::{
     FormatterError,
 };
 use std::fmt::Write;
-use sway_parse::{token::Delimiter, ItemEnum};
+use sway_parse::{token::Delimiter, token::PunctKind, ItemEnum};
 use sway_types::Spanned;
 
 impl Format for ItemEnum {
@@ -65,7 +65,9 @@ impl Format for ItemEnum {
                 // TODO: Improve handling this
                 formatted_code.push_str(&(0..required_alignment).map(|_| ' ').collect::<String>());
             }
-            formatted_code.push_str(" : ");
+            formatted_code.push(' ');
+            formatted_code.push(PunctKind::Colon.as_char());
+            formatted_code.push(' ');
             // TODO: We are currently converting ty to string directly but we will probably need to format ty before adding.
             formatted_code.push_str(type_field.ty.span().as_str());
             formatted_code.push(',');

sway-fmt-v2/src/items/item_struct.rs

@@ -7,7 +7,8 @@ use crate::{
     },
     FormatterError,
 };
-use sway_parse::ItemStruct;
+use std::fmt::Write;
+use sway_parse::{token::Delimiter, token::PunctKind, ItemStruct};
 use sway_types::Spanned;
 
 impl Format for ItemStruct {
@@ -77,7 +78,7 @@ fn format_struct(
 
     // Check if there is generic provided
     if let Some(generics) = &item_struct.generics {
-        // Push angle brace
+        // Push open angle brace
         ItemStruct::open_angle_bracket(formatted_code, formatter)?;
         // Get generics fields
         let generics = generics.parameters.inner.value_separator_pairs.clone();
@@ -89,6 +90,8 @@ fn format_struct(
                 formatted_code.push_str(", ");
             }
         }
+        // Push closing angle brace
+        ItemStruct::close_angle_bracket(formatted_code, formatter)?;
     }
 
     // Handle openning brace
@@ -99,7 +102,8 @@ fn format_struct(
         // Push a single whitespace before `{`
         formatted_code.push(' ');
         // Push open brace
-        formatted_code.push('{');
+        let open_brace = Delimiter::Brace.as_open_char();
+        formatted_code.push(open_brace);
         // Push a single whitespace after `{`
         formatted_code.push(' ');
     }
@@ -177,16 +181,17 @@ impl CurlyBrace for ItemStruct {
     ) -> Result<(), FormatterError> {
         let brace_style = formatter.config.items.item_brace_style;
         let extra_width = formatter.config.whitespace.tab_spaces;
+        let open_brace = Delimiter::Brace.as_open_char();
         let mut shape = formatter.shape;
         match brace_style {
             ItemBraceStyle::AlwaysNextLine => {
                 // Add openning brace to the next line.
-                line.push_str("\n{");
+                write!(line, "\n{}", open_brace)?;
                 shape = shape.block_indent(extra_width);
             }
             _ => {
                 // Add opening brace to the same line
-                line.push_str(" {");
+                write!(line, " {}", open_brace)?;
                 shape = shape.block_indent(extra_width);
             }
         }
@@ -199,7 +204,8 @@ impl CurlyBrace for ItemStruct {
         line: &mut String,
         formatter: &mut Formatter,
     ) -> Result<(), FormatterError> {
-        line.push('}');
+        let close_brace = Delimiter::Brace.as_close_char();
+        write!(line, "{}", close_brace)?;
         // If shape is becoming left-most alligned or - indent just have the defualt shape
         formatter.shape = formatter
             .shape
@@ -214,15 +220,17 @@ impl AngleBracket for ItemStruct {
         line: &mut String,
         _formatter: &mut Formatter,
     ) -> Result<(), FormatterError> {
-        line.push('<');
+        let open_angle = PunctKind::LessThan.as_char();
+        write!(line, "{}", open_angle)?;
         Ok(())
     }
 
     fn close_angle_bracket(
         line: &mut String,
         _formatter: &mut Formatter,
     ) -> Result<(), FormatterError> {
-        line.push('>');
+        let close_angle = PunctKind::GreaterThan.as_char();
+        write!(line, "{}", close_angle)?;
         Ok(())
     }
 }

sway-fmt-v2/src/utils/program_type.rs

@@ -1,4 +1,4 @@
-use sway_parse::ModuleKind;
+use sway_parse::{token::PunctKind, ModuleKind};
 use sway_types::Spanned;
 
 /// Insert the program type without applying a formatting to it.
@@ -24,7 +24,6 @@ pub(crate) fn insert_program_type(push_to: &mut String, module_kind: ModuleKind)
             push_to.push_str(name.as_str());
         }
     };
-    push_to.push(';');
-    push_to.push('\n');
-    push_to.push('\n');
+    push_to.push(PunctKind::Semicolon.as_char());
+    push_to.push_str("\n\n");
 }