feat(compliance): update to latest 2.0 spec (#103)

kdl-org · Dec 19, 2024 · 4734b06 · 4734b06
1 parent d0366db
commit 4734b06
Show file tree

Hide file tree

Showing 27 changed files with 62 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,7 +1,7 @@
 //! `kdl` is a "document-oriented" parser and API for the [KDL Document
 //! Language](https://kdl.dev), a node-based, human-friendly configuration and
 //! serialization format.
-//! 
+//!
 //! Unlike serde-based implementations, this crate preserves formatting when
 //! editing, as well as when inserting or changing values with custom
 //! formatting. This is most useful when working with human-maintained KDL

diff --git a/src/v2_parser.rs b/src/v2_parser.rs
@@ -866,7 +866,7 @@ fn badval_ty_char(input: &mut Input<'_>) -> PResult<()> {
 
 /// `line-space := newline | ws | single-line-comment`
 fn line_space(input: &mut Input<'_>) -> PResult<()> {
-    alt((newline, ws, single_line_comment)).parse_next(input)
+    alt((node_space, newline, single_line_comment)).parse_next(input)
 }
 
 /// `node-space := ws* escline ws* | ws+`

diff --git a/tests/test_cases/expected_kdl/esc_multiple_newlines.kdl b/tests/test_cases/expected_kdl/esc_multiple_newlines.kdl
@@ -0,0 +1 @@
+node "12"
diff --git a/tests/test_cases/expected_kdl/escline_after_semicolon.kdl b/tests/test_cases/expected_kdl/escline_after_semicolon.kdl
@@ -0,0 +1,2 @@
+node
+node
diff --git a/tests/test_cases/expected_kdl/escline_alone.kdl b/tests/test_cases/expected_kdl/escline_alone.kdl
@@ -0,0 +1 @@
+
diff --git a/tests/test_cases/expected_kdl/escline_empty_line.kdl b/tests/test_cases/expected_kdl/escline_empty_line.kdl
@@ -0,0 +1 @@
+node
diff --git a/tests/test_cases/expected_kdl/escline_end_of_node.kdl b/tests/test_cases/expected_kdl/escline_end_of_node.kdl
@@ -0,0 +1,2 @@
+a
+b
diff --git a/tests/test_cases/expected_kdl/escline_in_child_block.kdl b/tests/test_cases/expected_kdl/escline_in_child_block.kdl
@@ -0,0 +1,4 @@
+parent {
+    child
+    child
+}
diff --git a/tests/test_cases/expected_kdl/escline_node_type.kdl b/tests/test_cases/expected_kdl/escline_node_type.kdl
@@ -0,0 +1 @@
+(type)node
diff --git a/tests/test_cases/expected_kdl/escline_slashdash.kdl b/tests/test_cases/expected_kdl/escline_slashdash.kdl
@@ -0,0 +1 @@
+node
diff --git a/tests/test_cases/expected_kdl/multiline_string_double_backslash.kdl b/tests/test_cases/expected_kdl/multiline_string_double_backslash.kdl
@@ -0,0 +1 @@
+node "a\\ b\na\\b"
diff --git a/tests/test_cases/expected_kdl/multiline_string_escape_delimiter.kdl b/tests/test_cases/expected_kdl/multiline_string_escape_delimiter.kdl
@@ -0,0 +1 @@
+node "\"\"\""
diff --git a/tests/test_cases/expected_kdl/multiline_string_escape_newline_at_end.kdl b/tests/test_cases/expected_kdl/multiline_string_escape_newline_at_end.kdl
@@ -0,0 +1 @@
+node " a"
diff --git a/tests/test_cases/input/esc_multiple_newlines.kdl b/tests/test_cases/input/esc_multiple_newlines.kdl
@@ -0,0 +1,4 @@
+node "1\
+
+
+2"
diff --git a/tests/test_cases/input/escline_after_semicolon.kdl b/tests/test_cases/input/escline_after_semicolon.kdl
@@ -0,0 +1,2 @@
+node; \
+node
diff --git a/tests/test_cases/input/escline_alone.kdl b/tests/test_cases/input/escline_alone.kdl
@@ -0,0 +1 @@
+\
diff --git a/tests/test_cases/input/escline_empty_line.kdl b/tests/test_cases/input/escline_empty_line.kdl
@@ -0,0 +1,3 @@
+\
+
+node
diff --git a/tests/test_cases/input/escline_end_of_node.kdl b/tests/test_cases/input/escline_end_of_node.kdl
@@ -0,0 +1,3 @@
+a \
+
+b
diff --git a/tests/test_cases/input/escline_in_child_block.kdl b/tests/test_cases/input/escline_in_child_block.kdl
@@ -0,0 +1,5 @@
+parent {
+    child
+    \ // comment
+    child
+}
diff --git a/tests/test_cases/input/escline_node.kdl b/tests/test_cases/input/escline_node.kdl
@@ -1,2 +1,3 @@
 node1
+\
 node2
diff --git a/tests/test_cases/input/escline_node_type.kdl b/tests/test_cases/input/escline_node_type.kdl
@@ -0,0 +1,2 @@
+\
+(type)node
diff --git a/tests/test_cases/input/escline_slashdash.kdl b/tests/test_cases/input/escline_slashdash.kdl
@@ -0,0 +1,4 @@
+node
+\
+/-
+node
diff --git a/tests/test_cases/input/multiline_string_double_backslash.kdl b/tests/test_cases/input/multiline_string_double_backslash.kdl
@@ -0,0 +1,4 @@
+node """
+a\\ b
+a\\\ b
+"""
diff --git a/tests/test_cases/input/multiline_string_escape_delimiter.kdl b/tests/test_cases/input/multiline_string_escape_delimiter.kdl
@@ -0,0 +1,3 @@
+node """
+\"""
+"""
diff --git a/tests/test_cases/input/multiline_string_escape_newline_at_end.kdl b/tests/test_cases/input/multiline_string_escape_newline_at_end.kdl
@@ -0,0 +1,4 @@
+node """
+    a
+   \
+"""
diff --git a/tests/test_cases/input/multiline_string_escape_newline_at_end_fail.kdl b/tests/test_cases/input/multiline_string_escape_newline_at_end_fail.kdl
@@ -0,0 +1,4 @@
+node """
+a
+   \
+"""
diff --git a/tests/test_cases/input/multiline_string_non_literal_prefix_fail.kdl b/tests/test_cases/input/multiline_string_non_literal_prefix_fail.kdl
@@ -0,0 +1,4 @@
+node """
+\s escaped prefix
+  literal prefix
+  """
-Original file line number
+Diff line change
@@ -1,2 +1,3 @@
     node1
+    \
     node2