Skip to content
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.

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

feat(toml)!: Update generator by using toml_edit #470

Merged
merged 2 commits into from
Jan 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
60 changes: 60 additions & 0 deletions crates/toml/src/fmt.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#[derive(Copy, Clone, Default)]
pub(crate) struct DocumentFormatter {
pub(crate) multiline_array: bool,
}

impl toml_edit::visit_mut::VisitMut for DocumentFormatter {
fn visit_document_mut(&mut self, node: &mut toml_edit::Document) {
toml_edit::visit_mut::visit_document_mut(self, node);
}

fn visit_item_mut(&mut self, node: &mut toml_edit::Item) {
let other = std::mem::take(node);
let other = match other.into_table().map(toml_edit::Item::Table) {
Ok(i) => i,
Err(i) => i,
};
let other = match other
.into_array_of_tables()
.map(toml_edit::Item::ArrayOfTables)
{
Ok(i) => i,
Err(i) => i,
};
*node = other;

toml_edit::visit_mut::visit_item_mut(self, node);
}

fn visit_table_mut(&mut self, node: &mut toml_edit::Table) {
node.decor_mut().clear();

// Empty tables could be semantically meaningful, so make sure they are not implicit
if !node.is_empty() {
node.set_implicit(true);
}

toml_edit::visit_mut::visit_table_mut(self, node);
}

fn visit_value_mut(&mut self, node: &mut toml_edit::Value) {
node.decor_mut().clear();

toml_edit::visit_mut::visit_value_mut(self, node);
}

fn visit_array_mut(&mut self, node: &mut toml_edit::Array) {
toml_edit::visit_mut::visit_array_mut(self, node);

if !self.multiline_array || (0..=1).contains(&node.len()) {
node.set_trailing("");
node.set_trailing_comma(false);
} else {
for item in node.iter_mut() {
item.decor_mut().set_prefix("\n ");
}
node.set_trailing("\n");
node.set_trailing_comma(true);
}
}
}
4 changes: 3 additions & 1 deletion crates/toml/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,16 @@ pub use crate::value::Value;

pub mod ser;
#[doc(no_inline)]
pub use crate::ser::{to_string, to_string_pretty, to_vec, Serializer};
pub use crate::ser::{to_string, to_string_pretty, Serializer};
pub mod de;
#[doc(no_inline)]
pub use crate::de::{from_str, Deserializer, ValueDeserializer};

#[doc(hidden)]
pub mod macros;

mod fmt;

pub use serde_spanned::Spanned;

// Shortcuts for the module doc-comment
Expand Down
Loading