fix formatting

kdl-org · Oct 5, 2024 · 792f3a2 · 792f3a2
1 parent 3f55cef
commit 792f3a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/examples/insert-node.rs b/examples/insert-node.rs
@@ -27,7 +27,7 @@ words {
     let word_node = KdlNode::new(identifier);
     word_nodes.push(word_node);
     word_nodes.sort_by(sort_by_name);
-    words_section.fmt();
+    words_section.autoformat();
 
     println!("{}", doc);
 

diff --git a/src/document.rs b/src/document.rs
@@ -345,9 +345,6 @@ impl KdlDocument {
         }
         for node in &self.nodes {
             node.stringify(f, indent)?;
-            if node.format().is_none() {
-                writeln!(f)?;
-            }
         }
         if let Some(KdlDocumentFormat { trailing, .. }) = self.format() {
             write!(f, "{}", trailing)?;
@@ -549,9 +546,11 @@ final;";
         doc.nodes_mut().push(bar);
         doc.nodes_mut().push(KdlNode::new("baz"));
 
+        doc.autoformat();
+
         assert_eq!(
             r#"foo
-bar prop="value" 1 2 false null {
+bar prop=value 1 2 #false #null {
     barchild
 }
 baz
@@ -598,7 +597,6 @@ baz
 
         KdlDocument::autoformat(&mut doc);
 
-        print!("{}", doc);
         assert_eq!(
             doc.to_string(),
             r#"/* x */
@@ -611,7 +609,7 @@ foo 1 bar=0xdeadbeef {
 
 
        multiline*/
-        inner1 r"value"
+        inner1 value
         inner2 {
             inner3
         }

diff --git a/src/node.rs b/src/node.rs
@@ -11,6 +11,8 @@ use crate::{
     v2_parser, KdlDocument, KdlDocumentFormat, KdlEntry, KdlIdentifier, KdlParseFailure, KdlValue,
 };
 
+static INDENT: usize = 4;
+
 /// Represents an individual KDL
 /// [`Node`](https://github.com/kdl-org/kdl/blob/main/SPEC.md#node) inside a
 /// KDL Document.
@@ -56,7 +58,7 @@ impl KdlNode {
             ty: None,
             entries: Vec::new(),
             children: None,
-            format: None,
+            format: Some(KdlNodeFormat { trailing: "\n".into(), ..Default::default() }),
             #[cfg(feature = "span")]
             span: SourceSpan::from(0..0),
         }
@@ -382,12 +384,12 @@ impl KdlNode {
         self.format = Some(format);
     }
     /// Auto-formats this node and its contents.
-    pub fn fmt(&mut self) {
+    pub fn autoformat(&mut self) {
         self.autoformat_impl(0, false);
     }
 
     /// Auto-formats this node and its contents, stripping comments.
-    pub fn fmt_no_comments(&mut self) {
+    pub fn autoformat_no_comments(&mut self) {
         self.autoformat_impl(0, true);
     }
 
@@ -530,9 +532,12 @@ impl KdlNode {
                     trailing.insert(0, ' ');
                 }
             }
+            *trailing = trailing.trim().into();
             trailing.push('\n');
 
             *before_children = " ".into();
+        } else {
+            self.set_format(KdlNodeFormat { trailing: "\n".into(), ..Default::default() })
         }
         self.name.clear_format();
         if let Some(ty) = self.ty.as_mut() {
@@ -542,9 +547,10 @@ impl KdlNode {
             entry.autoformat();
         }
         if let Some(children) = self.children.as_mut() {
-            children.autoformat_impl(indent + 4, no_comments);
+            children.autoformat_impl(indent + INDENT, no_comments);
             if let Some(KdlDocumentFormat { leading, trailing }) = children.format_mut() {
-                *leading = "\n".into();
+                *leading = leading.trim().into();
+                leading.push('\n');
                 trailing.push_str(format!("{:indent$}", "", indent = indent).as_str());
             }
         }