fix: fixed a parsing error on new lines in delimited expressions

antidotum/tergo/src/rust/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "tergo"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 
 [lib]
 crate-type = ["staticlib"]
 name = "tergo"
 
 [dependencies]
-tergo-lib = "0.2.7"
+tergo-lib = "0.2.8"
 toml = "0.8.19"
 extendr-api = "*"
 

balnea/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tergo-lib"
-version = "0.2.7"
+version = "0.2.8"
 edition = "2021"
 description = "A tool to format R code"
 license = "MIT"
@@ -13,7 +13,7 @@ path = "src/lib.rs"
 
 [dependencies]
 tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.2" }
-parser = { package = "tergo-parser", path = "../spongia", version = "0.2.2" }
+parser = { package = "tergo-parser", path = "../spongia", version = "0.2.3" }
 formatter = { package = "tergo-formatter", path = "../unguentum", version = "0.2.6" }
 log = "0.4.21"
 env_logger = "0.11.3"

balnea/tests/format_integration.rs

@@ -267,6 +267,17 @@ comparison_test!(
     "092",
     Config::default()
 );
+comparison_test!(regression_25, "093", Config::default());
+comparison_test!(
+    function_call_with_one_unnamed_one_named_arg,
+    "094",
+    Config::default()
+);
+comparison_test!(
+    function_call_with_many_newlines_after_arg_names,
+    "095",
+    Config::default()
+);
 
 // Tidyverse styleguide examples
 comparison_test!(tidyverse_commas, "tidyverse_style_guide_001");

balnea/tests/test_cases/093.R

@@ -0,0 +1,2 @@
+list.files(".", ignore.case
+                    = TRUE)

balnea/tests/test_cases/093.expected

@@ -0,0 +1 @@
+list.files(".", ignore.case = TRUE)

balnea/tests/test_cases/094.R

@@ -0,0 +1 @@
+list.files(".", ignore.case = TRUE)

balnea/tests/test_cases/094.expected

@@ -0,0 +1 @@
+list.files(".", ignore.case = TRUE)

balnea/tests/test_cases/095.R

@@ -0,0 +1,8 @@
+list.files(".", ignore.case 
+
+  = TRUE, 
+test 
+
+= 
+
+1)

balnea/tests/test_cases/095.expected

@@ -0,0 +1 @@
+list.files(".", ignore.case = TRUE, test = 1)

scopa/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scopa"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 [lib]
@@ -9,7 +9,7 @@ path = "./src/lib.rs"
 
 [dependencies]
 wit-bindgen = "0.32.0"
-tergo-lib = { path = "../balnea", version = "0.2.0" }
+tergo-lib = { path = "../balnea", version = "0.2.8" }
 
 [dev-dependencies]
 wasm-tools = "1.217.0"

spongia/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tergo-parser"
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 license = "MIT"
 description = "Parser for tergo"

spongia/src/compound.rs

@@ -12,7 +12,7 @@ use crate::{
         Arg, Args, Delimiter, ElseIfConditional, Expression, ForLoop, FunctionDefinition,
         IfConditional, IfExpression, Lambda, RepeatExpression, TrailingElse, WhileExpression,
     },
-    expressions::expr,
+    expressions::{expr, expr_with_newlines},
     program::statement_or_expr,
     token_parsers::*,
     Input,
@@ -48,10 +48,10 @@ where
         tuple((
             left_delimiter,
             many0(newline),
-            opt(expr),
+            opt(expr_with_newlines),
             many0(tuple((
                 tuple((comma, many0(newline))),
-                tuple((opt(expr), many0(newline))),
+                tuple((opt(expr_with_newlines), many0(newline))),
             ))),
             many0(newline),
             right_delimiter,

spongia/src/expressions.rs

@@ -309,6 +309,22 @@ pub(crate) fn expr<'a, 'b: 'a>(tokens: Input<'a, 'b>) -> IResult<Input<'a, 'b>,
     }
 }
 
+pub(crate) fn expr_with_newlines<'a, 'b: 'a>(
+    tokens: Input<'a, 'b>,
+) -> IResult<Input<'a, 'b>, Expression<'a>> {
+    trace!("expr: {}", TokensBuffer(tokens));
+    let (mut tokens, term) = unary_term(tokens)?;
+    while !tokens.is_empty() && tokens[0].token == Newline {
+        tokens = &tokens[1..];
+    }
+    if !tokens.is_empty() {
+        let parser = ExprParser(0);
+        parser.parse(term, tokens)
+    } else {
+        Ok((tokens, term))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use tokenizer::tokens::commented_tokens;

tergo/Cargo.toml

@@ -10,5 +10,5 @@ repository = "https://github.com/kpagacz/tergo/"
 clap = { version = "4.5.17", features = ["derive"] }
 env_logger = "0.11.5"
 log = "0.4.22"
-tergo-lib = { path = "../balnea", version = "0.2.7" }
+tergo-lib = { path = "../balnea", version = "0.2.8" }
 toml = "0.8.19"

unguentum/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tergo-formatter"
-version = "0.2.6"
+version = "0.2.7"
 edition = "2021"
 license = "MIT"
 description = "Formatter for tergo"
@@ -10,7 +10,7 @@ repository = "https://github.com/kpagacz/tergo/tree/main/unguentum"
 
 [dependencies]
 tokenizer = { package = "tergo-tokenizer", path = "../aqua", version = "0.2.2" }
-parser = { package = "tergo-parser", path = "../spongia", version = "0.2.2" }
+parser = { package = "tergo-parser", path = "../spongia", version = "0.2.3" }
 log = "0.4.21"
 serde = { version = "1.0.210", features = ["derive"] }