sway-fmt-v2 formatting should use tokens directly from sway-parse (#2097

)

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

@@ -48,14 +48,22 @@ impl Format for ItemStruct {
 
 /// Format the struct if the multiline is passed as false struct will be formatted into a single line.
 ///
-/// Example (multiline : false):
+/// ## Examples
+///
+/// (multiline : false):
+///
+/// ```rust,ignore
 /// struct Foo { bar: u64,  baz: bool }
+/// ```
+///
+/// (multiline : true):
 ///
-/// Example (multiline : true):
+/// ```rust,ignore
 /// struct Foo {
-///  bar: u64,
-///  baz: bool,
+///     bar: u64,
+///     baz: bool,
 /// }
+/// ```
 fn format_struct(
     item_struct: &ItemStruct,
     formatted_code: &mut FormattedCode,

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");
 }