Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 28, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e831f74
sway-fmt-v2 uses tokens directly from parser & comments cleaned-up.
kayagokalp Jun 23, 2022
5187eb8
Merge branch 'master' into kayagokalp/2072
eureka-cpu Jun 25, 2022
aa6a142
merge master & use tokens from parser for struct
kayagokalp Jun 27, 2022
09cf7aa
fix forgetten brace
kayagokalp Jun 27, 2022
ba8fab8
struct angle brace fix
kayagokalp Jun 27, 2022
6772a75
Merge master
kayagokalp Jun 28, 2022
c077a33
doc updated
kayagokalp Jun 28, 2022
dbd76c9
Merge branch 'master' into kayagokalp/2072
eureka-cpu Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions sway-fmt-v2/src/items/item_struct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
7 changes: 3 additions & 4 deletions sway-fmt-v2/src/utils/program_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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");
Copy link
Contributor

@mitchmindtree mitchmindtree Jun 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also here ^

}