WIP

rust/kcl-lib/e2e/executor/inputs/cube.kcl

@@ -17,4 +17,4 @@ fn cube(length, center) {
   |> extrude(length = length)
 }
 
-myCube = cube(40, [0,0])
+myCube = cube(length = 40, center = [0,0])

rust/kcl-lib/src/parsing/parser.rs

@@ -24,13 +24,12 @@ use crate::{
     parsing::{
         ast::types::{
             Annotation, ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem,
-            BoxNode, CallExpression, CallExpressionKw, CommentStyle, DefaultParamVal, ElseIf, Expr,
+            BoxNode, CallExpressionKw, CommentStyle, DefaultParamVal, ElseIf, Expr, ExpressionStatement,
-            ExpressionStatement, FunctionExpression, Identifier, IfExpression, ImportItem, ImportSelector,
+            FunctionExpression, Identifier, IfExpression, ImportItem, ImportSelector, ImportStatement, ItemVisibility,
-            ImportStatement, ItemVisibility, LabeledArg, Literal, LiteralIdentifier, LiteralValue, MemberExpression,
+            LabeledArg, Literal, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeList,
-            MemberObject, Name, Node, NodeList, NonCodeMeta, NonCodeNode, NonCodeValue, ObjectExpression,
+            NonCodeMeta, NonCodeNode, NonCodeValue, ObjectExpression, ObjectProperty, Parameter, PipeExpression,
-            ObjectProperty, Parameter, PipeExpression, PipeSubstitution, PrimitiveType, Program, ReturnStatement,
+            PipeSubstitution, PrimitiveType, Program, ReturnStatement, Shebang, TagDeclarator, Type, TypeDeclaration,
-            Shebang, TagDeclarator, Type, TypeDeclaration, UnaryExpression, UnaryOperator, VariableDeclaration,
+            UnaryExpression, UnaryOperator, VariableDeclaration, VariableDeclarator, VariableKind,
-            VariableDeclarator, VariableKind,
         },
         math::BinaryExpressionToken,
         token::{Token, TokenSlice, TokenType},
@@ -936,7 +935,7 @@ fn object_property(i: &mut TokenSlice) -> PResult<Node<ObjectProperty>> {
     );
 
     if sep.token_type == TokenType::Colon {
-        ParseContext::err(
+        ParseContext::warn(
             CompilationError::err(
                 sep.into(),
                 "Using `:` to initialize objects is deprecated, prefer using `=`.",
@@ -1221,10 +1220,20 @@ fn if_expr(i: &mut TokenSlice) -> PResult<BoxNode<IfExpression>> {
 fn function_expr(i: &mut TokenSlice) -> PResult<Expr> {
     let fn_tok = opt(fun).parse_next(i)?;
     ignore_whitespace(i);
-    let result = function_decl.parse_next(i)?;
+    let (result, has_arrow) = function_decl.parse_next(i)?;
     if fn_tok.is_none() {
-        let err = CompilationError::fatal(result.as_source_range(), "Anonymous function requires `fn` before `(`");
+        if has_arrow {
-        return Err(ErrMode::Cut(err.into()));
+            ParseContext::warn(
+                CompilationError::err(
+                    result.as_source_range().start_as_range(),
+                    "Missing `fn` in function declaration",
+                )
+                .with_suggestion("Add `fn`", "fn", None, Tag::None),
+            );
+        } else {
+            let err = CompilationError::fatal(result.as_source_range(), "Anonymous function requires `fn` before `(`");
+            return Err(ErrMode::Cut(err.into()));
+        }
     }
     Ok(Expr::FunctionExpression(Box::new(result)))
 }
@@ -1234,7 +1243,7 @@ fn function_expr(i: &mut TokenSlice) -> PResult<Expr> {
 //     const x = arg0 + arg1;
 //     return x
 // }
-fn function_decl(i: &mut TokenSlice) -> PResult<Node<FunctionExpression>> {
+fn function_decl(i: &mut TokenSlice) -> PResult<(Node<FunctionExpression>, bool)> {
     fn return_type(i: &mut TokenSlice) -> PResult<Node<Type>> {
         colon(i)?;
         ignore_whitespace(i);
@@ -1246,6 +1255,8 @@ fn function_decl(i: &mut TokenSlice) -> PResult<Node<FunctionExpression>> {
     let params = parameters(i)?;
     close_paren(i)?;
     ignore_whitespace(i);
+    let arrow = opt(big_arrow).parse_next(i)?;
+    ignore_whitespace(i);
     // Optional return type.
     let return_type = opt(return_type).parse_next(i)?;
     ignore_whitespace(i);
@@ -1270,7 +1281,18 @@ fn function_decl(i: &mut TokenSlice) -> PResult<Node<FunctionExpression>> {
         open.module_id,
     );
 
-    Ok(result)
+    let has_arrow =
+        if let Some(arrow) = arrow {
+            ParseContext::warn(
+                CompilationError::err(arrow.as_source_range(), "Unnecessary `=>` in function declaration")
+                    .with_suggestion("Remove `=>`", "", None, Tag::Unnecessary),
+            );
+            true
+        } else {
+            false
+        };
+
+    Ok((result, has_arrow))
 }
 
 /// E.g. `person.name`
@@ -2031,7 +2053,6 @@ fn expr_allowed_in_pipe_expr(i: &mut TokenSlice) -> PResult<Expr> {
         bool_value.map(Expr::Literal),
         tag.map(Box::new).map(Expr::TagDeclarator),
         literal.map(Expr::Literal),
-        fn_call.map(Box::new).map(Expr::CallExpression),
         fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),
         name.map(Box::new).map(Expr::Name),
         array,
@@ -2051,7 +2072,6 @@ fn possible_operands(i: &mut TokenSlice) -> PResult<Expr> {
         bool_value.map(Expr::Literal),
         member_expression.map(Box::new).map(Expr::MemberExpression),
         literal.map(Expr::Literal),
-        fn_call.map(Box::new).map(Expr::CallExpression),
         fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),
         name.map(Box::new).map(Expr::Name),
         binary_expr_in_parens.map(Box::new).map(Expr::BinaryExpression),
@@ -2117,7 +2137,7 @@ fn declaration(i: &mut TokenSlice) -> PResult<BoxNode<VariableDeclaration>> {
             ignore_whitespace(i);
 
             let val = function_decl
-                .map(Box::new)
+                .map(|t| Box::new(t.0))
                 .map(Expr::FunctionExpression)
                 .context(expected("a KCL function expression, like () { return 1 }"))
                 .parse_next(i);
@@ -2151,7 +2171,7 @@ fn declaration(i: &mut TokenSlice) -> PResult<BoxNode<VariableDeclaration>> {
 
             if let Some((_, tok)) = decl_token {
                 let range_to_remove = SourceRange::new(tok.start, id.start, id.module_id);
-                ParseContext::err(
+                ParseContext::warn(
                     CompilationError::err(
                         tok.as_source_range(),
                         format!(
@@ -2379,9 +2399,17 @@ impl TryFrom<Token> for Node<TagDeclarator> {
                     token.value.as_str()
                 ),
             )),
+            // e.g. `line(%, $)`
+            TokenType::Brace => {
+                let r = token.as_source_range();
+                Err(CompilationError::fatal(
+                    SourceRange::new(r.start() - 1, r.end() - 1, r.module_id()),
+                    "Tag names must not be empty".to_string(),
+                ))
+            }
 
-            // e.g. `line(%, $)` or `line(%, $ , 5)`
+            // e.g. `line(%, $ , 5)`
-            TokenType::Brace | TokenType::Whitespace | TokenType::Comma => Err(CompilationError::fatal(
+            TokenType::Whitespace | TokenType::Comma => Err(CompilationError::fatal(
                 token.as_source_range(),
                 "Tag names must not be empty".to_string(),
             )),
@@ -2559,6 +2587,12 @@ fn some_brace(symbol: &'static str, i: &mut TokenSlice) -> PResult<Token> {
         .parse_next(i)
 }
 
+/// Parse a => operator.
+fn big_arrow(i: &mut TokenSlice) -> PResult<Token> {
+    one_of((TokenType::Operator, "=>"))
+        .context(expected("the => symbol, used for declaring functions"))
+        .parse_next(i)
+}
 /// Parse a |> operator.
 fn pipe_operator(i: &mut TokenSlice) -> PResult<Token> {
     one_of((TokenType::Operator, PIPE_OPERATOR))
@@ -2712,13 +2746,6 @@ fn pipe_sep(i: &mut TokenSlice) -> PResult<()> {
     Ok(())
 }
 
-/// Arguments are passed into a function.
-fn arguments(i: &mut TokenSlice) -> PResult<Vec<Expr>> {
-    separated(0.., expression, comma_sep)
-        .context(expected("function arguments"))
-        .parse_next(i)
-}
-
 fn labeled_argument(i: &mut TokenSlice) -> PResult<LabeledArg> {
     separated_pair(
         terminated(nameable_identifier, opt(whitespace)),
@@ -2987,11 +3014,7 @@ fn binding_name(i: &mut TokenSlice) -> PResult<Node<Identifier>> {
 
 /// Either a positional or keyword function call.
 fn fn_call_pos_or_kw(i: &mut TokenSlice) -> PResult<Expr> {
-    alt((
+    fn_call_kw.map(Box::new).map(Expr::CallExpressionKw).parse_next(i)
-        fn_call.map(Box::new).map(Expr::CallExpression),
-        fn_call_kw.map(Box::new).map(Expr::CallExpressionKw),
-    ))
-    .parse_next(i)
 }
 
 fn labelled_fn_call(i: &mut TokenSlice) -> PResult<Expr> {
@@ -3004,56 +3027,62 @@ fn labelled_fn_call(i: &mut TokenSlice) -> PResult<Expr> {
     }
 }
 
-fn fn_call(i: &mut TokenSlice) -> PResult<Node<CallExpression>> {
-    let fn_name = name(i)?;
-    opt(whitespace).parse_next(i)?;
-    let _ = terminated(open_paren, opt(whitespace)).parse_next(i)?;
-    let args = arguments(i)?;
-    let end = preceded(opt(whitespace), close_paren).parse_next(i)?.end;
-
-    let result = Node::new_node(
-        fn_name.start,
-        end,
-        fn_name.module_id,
-        CallExpression {
-            callee: fn_name,
-            arguments: args,
-            digest: None,
-        },
-    );
-
-    let callee_str = result.callee.name.name.to_string();
-    if let Some(suggestion) = super::deprecation(&callee_str, DeprecationKind::Function) {
-        ParseContext::warn(
-            CompilationError::err(
-                result.as_source_range(),
-                format!("Calling `{}` is deprecated, prefer using `{}`.", callee_str, suggestion),
-            )
-            .with_suggestion(
-                format!("Replace `{}` with `{}`", callee_str, suggestion),
-                suggestion,
-                None,
-                Tag::Deprecated,
-            ),
-        );
-    }
-
-    Ok(result)
-}
-
 fn fn_call_kw(i: &mut TokenSlice) -> PResult<Node<CallExpressionKw>> {
     let fn_name = name(i)?;
-    opt(whitespace).parse_next(i)?;
+    ignore_whitespace(i);
     let _ = open_paren.parse_next(i)?;
     ignore_whitespace(i);
 
+    // Special case: no args
+    let early_close = peek(close_paren).parse_next(i);
+    if early_close.is_ok() {
+        let cl = close_paren.parse_next(i)?;
+        let result = Node::new_node(
+            fn_name.start,
+            cl.end,
+            fn_name.module_id,
+            CallExpressionKw {
+                callee: fn_name,
+                unlabeled: Default::default(),
+                arguments: Default::default(),
+                digest: None,
+                non_code_meta: Default::default(),
+            },
+        );
+        return Ok(result);
+    }
+
+    // Special case: one arg (unlabeled)
+    let early_close = peek((expression, opt(whitespace), close_paren)).parse_next(i);
+    if early_close.is_ok() {
+        let first_expression = expression.parse_next(i)?;
+        ignore_whitespace(i);
+        let end = close_paren.parse_next(i)?.end;
+        let result = Node::new_node(
+            fn_name.start,
+            end,
+            fn_name.module_id,
+            CallExpressionKw {
+                callee: fn_name,
+                unlabeled: Some(first_expression),
+                arguments: Default::default(),
+                digest: None,
+                non_code_meta: Default::default(),
+            },
+        );
+        return Ok(result);
+    }
+
+    let initial_unlabeled_arg = opt((expression, comma, opt(whitespace)).map(|(arg, _, _)| arg)).parse_next(i)?;
+    ignore_whitespace(i);
+
+    // Start parsing labeled args.
     #[allow(clippy::large_enum_variant)]
     enum ArgPlace {
         NonCode(Node<NonCodeNode>),
         LabeledArg(LabeledArg),
         UnlabeledArg(Expr),
     }
-    let initial_unlabeled_arg = opt((expression, comma, opt(whitespace)).map(|(arg, _, _)| arg)).parse_next(i)?;
     let args: Vec<_> = repeat(
         0..,
         alt((
@@ -3192,18 +3221,6 @@ mod tests {
         assert_reserved("import");
     }
 
-    #[test]
-    fn parse_args() {
-        for (i, (test, expected_len)) in [("someVar", 1), ("5, 3", 2), (r#""a""#, 1)].into_iter().enumerate() {
-            let tokens = crate::parsing::token::lex(test, ModuleId::default()).unwrap();
-            let actual = match arguments.parse(tokens.as_slice()) {
-                Ok(x) => x,
-                Err(e) => panic!("Failed test {i}, could not parse function arguments from \"{test}\": {e:?}"),
-            };
-            assert_eq!(actual.len(), expected_len, "failed test {i}");
-        }
-    }
-
     #[test]
     fn parse_names() {
         for (test, expected_len) in [("someVar", 0), ("::foo", 0), ("foo::bar::baz", 2)] {
@@ -3284,7 +3301,7 @@ mod tests {
             return 1
         }"#;
         let tokens = crate::parsing::token::lex(test_program, ModuleId::default()).unwrap();
-        let expr = function_decl.parse_next(&mut tokens.as_slice()).unwrap();
+        let expr = function_decl.map(|t| t.0).parse_next(&mut tokens.as_slice()).unwrap();
         assert_eq!(expr.params, vec![]);
         let comment_start = expr.body.body[0].get_comments();
         let comment0 = expr.body.body[1].get_comments();
@@ -3301,7 +3318,7 @@ mod tests {
 comment */
 }"#;
         let tokens = crate::parsing::token::lex(test_program, ModuleId::default()).unwrap();
-        let expr = function_decl.parse_next(&mut tokens.as_slice()).unwrap();
+        let expr = function_decl.map(|t| t.0).parse_next(&mut tokens.as_slice()).unwrap();
         let comment0 = &expr.body.non_code_meta.non_code_nodes.get(&0).unwrap()[0];
         assert_eq!(comment0.value(), "block\ncomment");
     }
@@ -3370,7 +3387,7 @@ mySk1 = startSketchOn(XY)
             }";
         let module_id = ModuleId::from_usize(1);
         let tokens = crate::parsing::token::lex(test_program, module_id).unwrap();
-        let expr = function_decl.parse_next(&mut tokens.as_slice()).unwrap();
+        let expr = function_decl.map(|t| t.0).parse_next(&mut tokens.as_slice()).unwrap();
         assert_eq!(
             expr.body.non_code_meta.start_nodes,
             vec![Node::new(
@@ -3834,7 +3851,7 @@ mySk1 = startSketchOn(XY)
     #[test]
     fn pipes_on_pipes_minimal() {
         let test_program = r#"startSketchOn(XY)
-        |> startProfileAt([0, 0], %)
+        |> startProfile(at = [0, 0])
         |> line(endAbsolute = [0, -0]) // MoveRelative
 
         "#;
@@ -4104,8 +4121,8 @@ mySk1 = startSketchOn(XY)
     #[test]
     fn test_parse_half_pipe_small() {
         assert_err_contains(
-            "secondExtrude = startSketchOn(XY)
+            "secondExtrude = startSketchOn('XY')
-  |> startProfileAt([0,0], %)
+  |> startProfile(at = [0,0])
   |",
             "Unexpected token: |",
         );
@@ -4169,7 +4186,7 @@ height = [obj["a"] -1, 0]"#;
 
     #[test]
     fn test_anon_fn() {
-        crate::parsing::top_level_parse("foo(42, fn(x) { return x + 1 })").unwrap();
+        crate::parsing::top_level_parse("foo(42, closure = fn(x) { return x + 1 })").unwrap();
     }
 
     #[test]
@@ -4197,16 +4214,16 @@ height = [obj["a"] -1, 0]"#;
     fn test_parse_half_pipe() {
         let code = "height = 10
 
-firstExtrude = startSketchOn(XY)
+firstExtrude = startSketchOn('XY')
-  |> startProfileAt([0,0], %)
+  |> startProfile(at = [0,0])
-  |> line([0, 8], %)
+  |> line(at = [0, 8])
-  |> line([20, 0], %)
+  |> line(at = [20, 0])
-  |> line([0, -8], %)
+  |> line(at = [0, -8])
   |> close()
   |> extrude(length=2)
 
-secondExtrude = startSketchOn(XY)
+secondExtrude = startSketchOn('XY')
-  |> startProfileAt([0,0], %)
+  |> startProfile(at = [0,0])
   |";
         assert_err_contains(code, "Unexpected token: |");
     }
@@ -4476,8 +4493,8 @@ e
         let code = r#"/// Compute the cosine of a number (in radians).
 ///
 /// ```
-/// exampleSketch = startSketchOn(XZ)
+/// exampleSketch = startSketchOn("XZ")
-///   |> startProfileAt([0, 0], %)
+///   |> startProfile(at = [0, 0])
 ///   |> angledLine(
 ///        angle = 30,
 ///        length = 3 / cos(toRadians(30)),
@@ -4517,7 +4534,7 @@ export fn cos(num: number(rad)): number(_) {}"#;
 
     #[test]
     fn error_underscore() {
-        let (_, errs) = assert_no_fatal("_foo(_blah, _)");
+        let (_, errs) = assert_no_fatal("_foo(_blah, arg = _)");
         assert_eq!(errs.len(), 3, "found: {errs:#?}");
     }
 
@@ -4530,7 +4547,7 @@ export fn cos(num: number(rad)): number(_) {}"#;
     #[test]
     fn zero_param_function() {
         let code = r#"
-        fn firstPrimeNumber() {
+        fn firstPrimeNumber = () => {
             return 2
         }
         firstPrimeNumber()
@@ -4618,6 +4635,26 @@ thing(false)
         crate::parsing::top_level_parse(some_program_string).unwrap();
     }
 
+    #[test]
+    fn test_error_define_function_as_var() {
+        for name in ["var", "let", "const"] {
+            let some_program_string = format!(
+                r#"{} thing = (param) => {{
+    return true
+}}
+
+thing(false)
+"#,
+                name
+            );
+            assert_err(
+                &some_program_string,
+                "Expected a `fn` variable kind, found: `const`",
+                [0, name.len()],
+            );
+        }
+    }
+
     #[test]
     fn test_error_define_var_as_function() {
         // TODO: https://github.com/KittyCAD/modeling-app/issues/784
@@ -4628,7 +4665,7 @@ thing(false)
 
     #[test]
     fn random_words_fail() {
-        let test_program = r#"part001 = startSketchOn(-XZ)
+        let test_program = r#"part001 = startSketchOn('-XZ')
     |> startProfileAt([8.53, 11.8], %)
     asdasd asdasd
     |> line([11.12, -14.82], %)
@@ -4641,18 +4678,18 @@ thing(false)
 
     #[test]
     fn test_member_expression_sketch() {
-        let some_program_string = r#"fn cube(pos, scale) {
+        let some_program_string = r#"fn cube = (pos, scale) => {
-  sg = startSketchOn(XY)
+  sg = startSketchOn('XY')
-  |> startProfileAt(pos, %)
+  |> startProfile(at = pos)
-    |> line([0, scale], %)
+    |> line([0, scale])
-    |> line([scale, 0], %)
+    |> line([scale, 0])
-    |> line([0, -scale], %)
+    |> line([0, -scale])
 
   return sg
 }
 
-b1 = cube([0,0], 10)
+b1 = cube(pos = [0,0], scale = 10)
-b2 = cube([3,3], 4)
+b2 = cube(pos = [3,3], scale = 4)
 
 pt1 = b1[0]
 pt2 = b2[0]
@@ -4669,18 +4706,18 @@ let other_thing = 2 * cos(3)"#;
 
     #[test]
     fn test_negative_arguments() {
-        let some_program_string = r#"fn box(p, h, l, w) {
+        let some_program_string = r#"fn box = (p, h, l, w) => {
- myBox = startSketchOn(XY)
+ myBox = startSketchOn('XY')
-    |> startProfileAt(p, %)
+    |> startProfile(at = p)
-    |> line([0, l], %)
+    |> line([0, l])
-    |> line([w, 0], %)
+    |> line([w, 0])
-    |> line([0, -l], %)
+    |> line([0, -l])
     |> close()
     |> extrude(length=h)
 
   return myBox
 }
-let myBox = box([0,0], -3, -16, -10)
+let myBox = box(p=[0,0], h=-3, l=-16, w=-10)
 "#;
         crate::parsing::top_level_parse(some_program_string).unwrap();
     }
@@ -4696,106 +4733,106 @@ let myBox = box([0,0], -3, -16, -10)
 
     #[test]
     fn test_parse_tag_named_std_lib() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
-    |> line([5, 5], %, $xLine)
+    |> line(end = [5, 5], tag = $xLine)
 "#;
         assert_err(
             some_program_string,
             "Cannot assign a tag to a reserved keyword: xLine",
-            [74, 80],
+            [85, 91],
         );
     }
 
     #[test]
     fn test_parse_empty_tag_brace() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
-    |> line(%, $)
+    |> line(end = [1, 1], tag = $)
     "#;
-        assert_err(some_program_string, "Tag names must not be empty", [67, 68]);
+        assert_err(some_program_string, "Tag names must not be empty", [85, 86]);
     }
     #[test]
     fn test_parse_empty_tag_whitespace() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
     |> line(%, $ ,01)
     "#;
-        assert_err(some_program_string, "Tag names must not be empty", [67, 68]);
+        assert_err(some_program_string, "Tag names must not be empty", [69, 70]);
     }
 
     #[test]
     fn test_parse_empty_tag_comma() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
     |> line(%, $,)
     "#;
-        assert_err(some_program_string, "Tag names must not be empty", [67, 68]);
+        assert_err(some_program_string, "Tag names must not be empty", [69, 70]);
     }
     #[test]
     fn test_parse_tag_starting_with_digit() {
         let some_program_string = r#"
-    startSketchOn(XY)
+    startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
     |> line(%, $01)"#;
         assert_err(
             some_program_string,
             "Tag names must not start with a number. Tag starts with `01`",
-            [72, 74],
+            [74, 76],
         );
     }
     #[test]
     fn test_parse_tag_including_digit() {
         let some_program_string = r#"
-    startSketchOn(XY)
+    startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
-    |> line(%, $var01)"#;
+    |> line(%, tag = $var01)"#;
         assert_no_err(some_program_string);
     }
     #[test]
     fn test_parse_tag_starting_with_bang() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
     |> line(%, $!var,01)
     "#;
-        assert_err(some_program_string, "Tag names must not start with a bang", [67, 68]);
+        assert_err(some_program_string, "Tag names must not start with a bang", [69, 70]);
     }
     #[test]
     fn test_parse_tag_starting_with_dollar() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
     |> line(%, $$,01)
     "#;
-        assert_err(some_program_string, "Tag names must not start with a dollar", [67, 68]);
+        assert_err(some_program_string, "Tag names must not start with a dollar", [69, 70]);
     }
     #[test]
     fn test_parse_tag_starting_with_fn() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
     |> line(%, $fn,01)
     "#;
-        assert_err(some_program_string, "Tag names must not start with a keyword", [67, 69]);
+        assert_err(some_program_string, "Tag names must not start with a keyword", [69, 71]);
     }
     #[test]
     fn test_parse_tag_starting_with_a_comment() {
-        let some_program_string = r#"startSketchOn(XY)
+        let some_program_string = r#"startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
     |> line(%, $//
     ,01)
     "#;
         assert_err(
             some_program_string,
             "Tag names must not start with a lineComment",
-            [67, 69],
+            [69, 71],
         );
     }
 
     #[test]
     fn test_parse_tag_with_reserved_in_middle_works() {
         let some_program_string = r#"
-    startSketchOn(XY)
+    startSketchOn('XY')
-    |> startProfileAt([0, 0], %)
+    |> startProfile(at = [0, 0])
-    |> line([5, 5], %, $sketching)
+    |> line(end = [5, 5], tag = $sketching)
     "#;
         assert_no_err(some_program_string);
     }
@@ -4803,21 +4840,21 @@ let myBox = box([0,0], -3, -16, -10)
     #[test]
     fn test_parse_array_missing_closing_bracket() {
         let some_program_string = r#"
-sketch001 = startSketchOn(XZ) |> startProfileAt([90.45, 119.09, %)"#;
+sketch001 = startSketchOn('XZ') |> startProfileAt([90.45, 119.09, %)"#;
         assert_err(
             some_program_string,
             "Encountered an unexpected character(s) before finding a closing bracket(`]`) for the array",
-            [49, 65],
+            [51, 67],
         );
     }
     #[test]
     fn test_parse_array_missing_comma() {
         let some_program_string = r#"
-sketch001 = startSketchOn(XZ) |> startProfileAt([90.45 119.09], %)"#;
+sketch001 = startSketchOn('XZ') |> startProfileAt([90.45 119.09], %)"#;
         assert_err(
             some_program_string,
             "Unexpected character encountered. You might be missing a comma in between elements.",
-            [50, 63],
+            [52, 65],
         );
     }
     #[test]
@@ -4825,21 +4862,21 @@ sketch001 = startSketchOn(XZ) |> startProfileAt([90.45 119.09], %)"#;
         // since there is an early exit if encountering a reserved word, the error should be about
         // that and not the missing comma
         let some_program_string = r#"
-sketch001 = startSketchOn(XZ) |> startProfileAt([90.45 $struct], %)"#;
+sketch001 = startSketchOn('XZ') |> startProfileAt([90.45 $struct], %)"#;
         assert_err(
             some_program_string,
             "Encountered an unexpected character(s) before finding a closing bracket(`]`) for the array",
-            [49, 50],
+            [51, 52],
         );
     }
     #[test]
     fn test_parse_array_random_brace() {
         let some_program_string = r#"
-sketch001 = startSketchOn(XZ) |> startProfileAt([}], %)"#;
+sketch001 = startSketchOn('XZ') |> startProfileAt([}], %)"#;
         assert_err(
             some_program_string,
             "Encountered an unexpected character(s) before finding a closing bracket(`]`) for the array",
-            [49, 50],
+            [51, 52],
         );
     }
 
@@ -4920,6 +4957,67 @@ bar = 1
         );
     }
 
+    #[test]
+    fn warn_object_expr() {
+        let some_program_string = "{ foo: bar }";
+        let (_, errs) = assert_no_err(some_program_string);
+        assert_eq!(errs.len(), 1);
+        assert_eq!(errs[0].apply_suggestion(some_program_string).unwrap(), "{ foo = bar }")
+    }
+
+    #[test]
+    fn warn_fn_decl() {
+        let some_program_string = r#"fn foo = () => {
+    return 0
+}"#;
+        let (_, errs) = assert_no_err(some_program_string);
+        assert_eq!(errs.len(), 2);
+        let replaced = errs[0].apply_suggestion(some_program_string).unwrap();
+        let replaced = errs[1].apply_suggestion(&replaced).unwrap();
+        // Note the whitespace here is bad, but we're just testing the suggestion spans really. In
+        // real life we might reformat after applying suggestions.
+        assert_eq!(
+            replaced,
+            r#"fn foo  ()  {
+    return 0
+}"#
+        );
+
+        let some_program_string = r#"myMap = map([0..5], f = (n) => {
+    return n * 2
+})"#;
+        let (_, errs) = assert_no_err(some_program_string);
+        assert_eq!(errs.len(), 2);
+        let replaced = errs[0].apply_suggestion(some_program_string).unwrap();
+        let replaced = errs[1].apply_suggestion(&replaced).unwrap();
+        assert_eq!(
+            replaced,
+            r#"myMap = map([0..5], f = fn(n)  {
+    return n * 2
+})"#
+        );
+    }
+
+    #[test]
+    fn warn_const() {
+        let some_program_string = r#"const foo = 0
+let bar = 1
+var baz = 2
+"#;
+        let (_, errs) = assert_no_err(some_program_string);
+        assert_eq!(errs.len(), 3);
+        let replaced = errs[2].apply_suggestion(some_program_string).unwrap();
+        let replaced = errs[1].apply_suggestion(&replaced).unwrap();
+        let replaced = errs[0].apply_suggestion(&replaced).unwrap();
+        assert_eq!(
+            replaced,
+            r#"foo = 0
+bar = 1
+baz = 2
+"#
+        );
+    }
+
     #[test]
     fn test_unary_not_on_keyword_bool() {
         let some_program_string = r#"!true"#;
@@ -5072,25 +5170,14 @@ mod snapshot_tests {
         };
     }
 
-    snapshot_test!(
+    snapshot_test!(b, "myVar = min(x = 5 , y = 3)"); // Space before comma
-        a,
+    snapshot_test!(c, "myVar = min(x = -legLen(hyp = 5, pot = 4), y = 5)");
-        r#"boxSketch = startSketchOn(XY)
+    snapshot_test!(d, "myVar = 5 + 6 |> myFunc(45, y = %)");
-    |> startProfileAt([0, 0], %)
+    snapshot_test!(e, "let x = 1 * (3 - 4)");
-    |> line([0, 10], %)
-    |> tangentialArc([-5, 5], %)
-    |> line([5, -15], %)
-    |> extrude(length=10)
-"#
-    );
-    snapshot_test!(b, "myVar = min(5 , -legLen(5, 4))"); // Space before comma
-
-    snapshot_test!(c, "myVar = min(-legLen(5, 4), 5)");
-    snapshot_test!(d, "myVar = 5 + 6 |> myFunc(45, %)");
-    snapshot_test!(e, "x = 1 * (3 - 4)");
     snapshot_test!(f, r#"x = 1 // this is an inline comment"#);
     snapshot_test!(
         g,
-        r#"fn x() {
+        r#"fn x = () => {
         return sg
         return sg
       }"#
@@ -5098,32 +5185,32 @@ mod snapshot_tests {
     snapshot_test!(d2, r#"x = -leg2 + thickness"#);
     snapshot_test!(
         h,
-        r#"obj = { a = 1, b = 2 }
+        r#"obj = { a: 1, b: 2 }
     height = 1 - obj.a"#
     );
     snapshot_test!(
         i,
-        r#"obj = { a = 1, b = 2 }
+        r#"obj = { a: 1, b: 2 }
      height = 1 - obj["a"]"#
     );
     snapshot_test!(
         j,
-        r#"obj = { a = 1, b = 2 }
+        r#"obj = { a: 1, b: 2 }
     height = obj["a"] - 1"#
     );
     snapshot_test!(
         k,
-        r#"obj = { a = 1, b = 2 }
+        r#"obj = { a: 1, b: 2 }
     height = [1 - obj["a"], 0]"#
     );
     snapshot_test!(
         l,
-        r#"obj = { a = 1, b = 2 }
+        r#"obj = { a: 1, b: 2 }
     height = [obj["a"] - 1, 0]"#
     );
     snapshot_test!(
         m,
-        r#"obj = {a = 1, b = 2 }
+        r#"obj = { a: 1, b: 2 }
     height = [obj["a"] -1, 0]"#
     );
     snapshot_test!(n, "height = 1 - obj.a");
@@ -5132,7 +5219,7 @@ mod snapshot_tests {
     snapshot_test!(q, r#"height = [ obj["a"], 0 ]"#);
     snapshot_test!(
         r,
-        r#"obj = { a = 1, b = 2 }
+        r#"obj = { a: 1, b: 2 }
     height = obj["a"]"#
     );
     snapshot_test!(s, r#"prop = yo["one"][two]"#);
@@ -5141,11 +5228,11 @@ mod snapshot_tests {
     snapshot_test!(v, r#"pt1 = b1[0]"#);
     snapshot_test!(w, r#"pt1 = b1['zero']"#);
     snapshot_test!(x, r#"pt1 = b1.zero"#);
-    snapshot_test!(y, r#"sg = startSketchOn(XY) |> startProfileAt(pos, %)"#);
+    snapshot_test!(y, r#"sg = startSketchOn(XY) |> startProfile(at = pos)"#);
     snapshot_test!(
         z,
         "sg = startSketchOn(XY)
-    |> startProfileAt(pos) |> line([0, -scale], %)"
+    |> startProfile(at = pos) |> line([0, -scale])"
     );
     snapshot_test!(aa, r#"sg = -scale"#);
     snapshot_test!(ab, "line(endAbsolute = [0, -1])");
@@ -5153,14 +5240,14 @@ mod snapshot_tests {
     snapshot_test!(
         ad,
         r#"
-    fn firstPrimeNumber() {
+    fn firstPrimeNumber = () => {
         return 2
     }
     firstPrimeNumber()"#
     );
     snapshot_test!(
         ae,
-        r#"fn thing(param) {
+        r#"fn thing = (param) => {
         return true
     }
     thing(false)"#
@@ -5168,7 +5255,7 @@ mod snapshot_tests {
     snapshot_test!(
         af,
         r#"mySketch = startSketchOn(XY)
-        |> startProfileAt([0,0], %)
+        |> startProfile(%,at=[0,0])
         |> line(endAbsolute = [0, 1], tag = $myPath)
         |> line(endAbsolute = [1, 1])
         |> line(endAbsolute = [1, 0], tag = $rightPath)
@@ -5176,24 +5263,24 @@ mod snapshot_tests {
     );
     snapshot_test!(
         ag,
-        "mySketch = startSketchOn(XY) |> startProfileAt([0,0], %) |> line(endAbsolute = [1, 1]) |> close()"
+        "mySketch = startSketchOn(XY) |> startProfile(at=[0,0]) |> line(endAbsolute = [1, 1]) |> close()"
     );
-    snapshot_test!(ah, "myBox = startSketchOn(XY) |> startProfileAt(p, %)");
+    snapshot_test!(ah, "myBox = startSketchOn(XY) |> startProfileAt(p)");
-    snapshot_test!(ai, r#"myBox = f(1) |> g(2, %)"#);
+    snapshot_test!(ai, r#"myBox = f(1) |> g(2, arg=%)"#);
     snapshot_test!(
         aj,
-        r#"myBox = startSketchOn(XY) |> startProfileAt(p, %) |> line(end = [0, l])"#
+        r#"myBox = startSketchOn(XY) |> startProfile(%, at=p) |> line(end = [0, l])"#
     );
     snapshot_test!(ak, "line(endAbsolute = [0, 1])");
-    snapshot_test!(ap, "mySketch = startSketchOn(XY) |> startProfileAt([0,0], %)");
+    snapshot_test!(ap, "mySketch = startSketchOn(XY) |> startProfile(at = [0,0])");
-    snapshot_test!(aq, "log(5, \"hello\", aIdentifier)");
+    snapshot_test!(aq, "log(5, arg=\"hello\", arg2=aIdentifier)");
     snapshot_test!(ar, r#"5 + "a""#);
-    snapshot_test!(at, "line([0, l], %)");
+    snapshot_test!(at, "line(%, end = [0, l])");
     snapshot_test!(au, include_str!("../../e2e/executor/inputs/cylinder.kcl"));
-    snapshot_test!(av, "fn f(angle?) { return default(angle, 360) }");
+    snapshot_test!(av, "fn f = (angle?) => { return default(ifNone=360, otherwise=360) }");
     snapshot_test!(
         aw,
-        "numbers = [
+        "let numbers = [
             1,
             // A,
             // B,
@@ -5202,7 +5289,7 @@ mod snapshot_tests {
     );
     snapshot_test!(
         ax,
-        "numbers = [
+        "let numbers = [
             1,
             2,
             // A,
@@ -5219,7 +5306,7 @@ mod snapshot_tests {
     );
     snapshot_test!(
         az,
-        "props = {
+        "let props = {
             a: 1,
             // b: 2,
             c: 3
@@ -5249,14 +5336,14 @@ my14 = 4 ^ 2 - 3 ^ 2 * 2
             5
         }"#
     );
-    snapshot_test!(be, "x = 3 == 3");
+    snapshot_test!(be, "let x = 3 == 3");
-    snapshot_test!(bf, "x = 3 != 3");
+    snapshot_test!(bf, "let x = 3 != 3");
     snapshot_test!(bg, r#"x = 4"#);
-    snapshot_test!(bh, "obj = {center = [10, 10], radius =5}");
+    snapshot_test!(bh, "obj = {center : [10, 10], radius: 5}");
     snapshot_test!(
         bi,
         r#"x = 3
-        obj = { x, y = 4}"#
+        obj = { x, y: 4}"#
     );
     snapshot_test!(bj, "true");
     snapshot_test!(bk, "truee");
@@ -5290,6 +5377,8 @@ my14 = 4 ^ 2 - 3 ^ 2 * 2
            )"#
     );
     snapshot_test!(kw_function_in_binary_op, r#"val = f(x = 1) + 1"#);
+    snapshot_test!(kw_function_args_zero, r#"val = f()"#);
+    snapshot_test!(kw_function_args_one, r#"val = f(3)"#);
 }
 
 #[allow(unused)]

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__a.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 170,
+        "end": 178,
         "id": {
           "commentStart": 0,
           "end": 9,
@@ -61,44 +61,47 @@ expression: actual
             {
               "arguments": [
                 {
-                  "commentStart": 52,
+                  "type": "LabeledArg",
-                  "elements": [
+                  "label": {
-                    {
+                    "commentStart": 52,
-                      "commentStart": 53,
+                    "end": 54,
-                      "end": 54,
+                    "name": "at",
-                      "raw": "0",
+                    "start": 52,
-                      "start": 53,
+                    "type": "Identifier"
-                      "type": "Literal",
+                  },
-                      "type": "Literal",
+                  "arg": {
-                      "value": {
+                    "commentStart": 57,
-                        "value": 0.0,
+                    "elements": [
-                        "suffix": "None"
+                      {
+                        "commentStart": 58,
+                        "end": 59,
+                        "raw": "0",
+                        "start": 58,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
+                      },
+                      {
+                        "commentStart": 61,
+                        "end": 62,
+                        "raw": "0",
+                        "start": 61,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
                       }
-                    },
+                    ],
-                    {
+                    "end": 63,
-                      "commentStart": 56,
+                    "start": 57,
-                      "end": 57,
+                    "type": "ArrayExpression",
-                      "raw": "0",
+                    "type": "ArrayExpression"
-                      "start": 56,
+                  }
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 0.0,
-                        "suffix": "None"
-                      }
-                    }
-                  ],
-                  "end": 58,
-                  "start": 52,
-                  "type": "ArrayExpression",
-                  "type": "ArrayExpression"
-                },
-                {
-                  "commentStart": 60,
-                  "end": 61,
-                  "start": 60,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
                 }
               ],
               "callee": {
@@ -117,86 +120,91 @@ expression: actual
                 "type": "Name"
               },
               "commentStart": 37,
-              "end": 62,
+              "end": 64,
               "start": 37,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             },
             {
               "arguments": [
                 {
-                  "commentStart": 75,
+                  "type": "LabeledArg",
-                  "elements": [
+                  "label": {
-                    {
+                    "commentStart": 77,
-                      "commentStart": 76,
+                    "end": 80,
-                      "end": 77,
+                    "name": "end",
-                      "raw": "0",
+                    "start": 77,
-                      "start": 76,
+                    "type": "Identifier"
-                      "type": "Literal",
+                  },
-                      "type": "Literal",
+                  "arg": {
-                      "value": {
+                    "commentStart": 83,
-                        "value": 0.0,
+                    "elements": [
-                        "suffix": "None"
+                      {
+                        "commentStart": 84,
+                        "end": 85,
+                        "raw": "0",
+                        "start": 84,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
+                      },
+                      {
+                        "commentStart": 87,
+                        "end": 89,
+                        "raw": "10",
+                        "start": 87,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 10.0,
+                          "suffix": "None"
+                        }
                       }
-                    },
+                    ],
-                    {
+                    "end": 90,
-                      "commentStart": 79,
+                    "start": 83,
-                      "end": 81,
+                    "type": "ArrayExpression",
-                      "raw": "10",
+                    "type": "ArrayExpression"
-                      "start": 79,
+                  }
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 10.0,
-                        "suffix": "None"
-                      }
-                    }
-                  ],
-                  "end": 82,
-                  "start": 75,
-                  "type": "ArrayExpression",
-                  "type": "ArrayExpression"
-                },
-                {
-                  "commentStart": 84,
-                  "end": 85,
-                  "start": 84,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
                 }
               ],
               "callee": {
                 "abs_path": false,
-                "commentStart": 70,
+                "commentStart": 72,
-                "end": 74,
+                "end": 76,
                 "name": {
-                  "commentStart": 70,
+                  "commentStart": 72,
-                  "end": 74,
+                  "end": 76,
                   "name": "line",
-                  "start": 70,
+                  "start": 72,
                   "type": "Identifier"
                 },
                 "path": [],
-                "start": 70,
+                "start": 72,
                 "type": "Name"
               },
-              "commentStart": 70,
+              "commentStart": 72,
-              "end": 86,
+              "end": 91,
-              "start": 70,
+              "start": 72,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             },
             {
               "arguments": [
                 {
-                  "commentStart": 108,
+                  "commentStart": 113,
                   "elements": [
                     {
                       "argument": {
-                        "commentStart": 110,
+                        "commentStart": 115,
-                        "end": 111,
+                        "end": 116,
                         "raw": "5",
-                        "start": 110,
+                        "start": 115,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -204,18 +212,18 @@ expression: actual
                           "suffix": "None"
                         }
                       },
-                      "commentStart": 109,
+                      "commentStart": 114,
-                      "end": 111,
+                      "end": 116,
                       "operator": "-",
-                      "start": 109,
+                      "start": 114,
                       "type": "UnaryExpression",
                       "type": "UnaryExpression"
                     },
                     {
-                      "commentStart": 113,
+                      "commentStart": 118,
-                      "end": 114,
+                      "end": 119,
                       "raw": "5",
-                      "start": 113,
+                      "start": 118,
                       "type": "Literal",
                       "type": "Literal",
                       "value": {
@@ -224,109 +232,37 @@ expression: actual
                       }
                     }
                   ],
-                  "end": 115,
+                  "end": 120,
-                  "start": 108,
+                  "start": 113,
                   "type": "ArrayExpression",
                   "type": "ArrayExpression"
                 },
                 {
-                  "commentStart": 117,
+                  "commentStart": 122,
-                  "end": 118,
+                  "end": 123,
-                  "start": 117,
+                  "start": 122,
                   "type": "PipeSubstitution",
                   "type": "PipeSubstitution"
                 }
               ],
               "callee": {
                 "abs_path": false,
-                "commentStart": 94,
+                "commentStart": 99,
-                "end": 107,
+                "end": 112,
                 "name": {
-                  "commentStart": 94,
+                  "commentStart": 99,
-                  "end": 107,
+                  "end": 112,
                   "name": "tangentialArc",
-                  "start": 94,
+                  "start": 99,
                   "type": "Identifier"
                 },
                 "path": [],
-                "start": 94,
+                "start": 99,
                 "type": "Name"
               },
-              "commentStart": 94,
+              "commentStart": 99,
-              "end": 119,
+              "end": 124,
-              "start": 94,
+              "start": 99,
-              "type": "CallExpression",
-              "type": "CallExpression"
-            },
-            {
-              "arguments": [
-                {
-                  "commentStart": 132,
-                  "elements": [
-                    {
-                      "commentStart": 133,
-                      "end": 134,
-                      "raw": "5",
-                      "start": 133,
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 5.0,
-                        "suffix": "None"
-                      }
-                    },
-                    {
-                      "argument": {
-                        "commentStart": 137,
-                        "end": 139,
-                        "raw": "15",
-                        "start": 137,
-                        "type": "Literal",
-                        "type": "Literal",
-                        "value": {
-                          "value": 15.0,
-                          "suffix": "None"
-                        }
-                      },
-                      "commentStart": 136,
-                      "end": 139,
-                      "operator": "-",
-                      "start": 136,
-                      "type": "UnaryExpression",
-                      "type": "UnaryExpression"
-                    }
-                  ],
-                  "end": 140,
-                  "start": 132,
-                  "type": "ArrayExpression",
-                  "type": "ArrayExpression"
-                },
-                {
-                  "commentStart": 142,
-                  "end": 143,
-                  "start": 142,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
-                }
-              ],
-              "callee": {
-                "abs_path": false,
-                "commentStart": 127,
-                "end": 131,
-                "name": {
-                  "commentStart": 127,
-                  "end": 131,
-                  "name": "line",
-                  "start": 127,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 127,
-                "type": "Name"
-              },
-              "commentStart": 127,
-              "end": 144,
-              "start": 127,
               "type": "CallExpression",
               "type": "CallExpression"
             },
@@ -335,17 +271,93 @@ expression: actual
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "commentStart": 160,
+                    "commentStart": 137,
-                    "end": 166,
+                    "end": 140,
-                    "name": "length",
+                    "name": "end",
-                    "start": 160,
+                    "start": 137,
                     "type": "Identifier"
                   },
                   "arg": {
-                    "commentStart": 167,
+                    "commentStart": 143,
-                    "end": 169,
+                    "elements": [
+                      {
+                        "commentStart": 144,
+                        "end": 145,
+                        "raw": "5",
+                        "start": 144,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 5.0,
+                          "suffix": "None"
+                        }
+                      },
+                      {
+                        "argument": {
+                          "commentStart": 148,
+                          "end": 150,
+                          "raw": "15",
+                          "start": 148,
+                          "type": "Literal",
+                          "type": "Literal",
+                          "value": {
+                            "value": 15.0,
+                            "suffix": "None"
+                          }
+                        },
+                        "commentStart": 147,
+                        "end": 150,
+                        "operator": "-",
+                        "start": 147,
+                        "type": "UnaryExpression",
+                        "type": "UnaryExpression"
+                      }
+                    ],
+                    "end": 151,
+                    "start": 143,
+                    "type": "ArrayExpression",
+                    "type": "ArrayExpression"
+                  }
+                }
+              ],
+              "callee": {
+                "abs_path": false,
+                "commentStart": 132,
+                "end": 136,
+                "name": {
+                  "commentStart": 132,
+                  "end": 136,
+                  "name": "line",
+                  "start": 132,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 132,
+                "type": "Name"
+              },
+              "commentStart": 132,
+              "end": 152,
+              "start": 132,
+              "type": "CallExpressionKw",
+              "type": "CallExpressionKw",
+              "unlabeled": null
+            },
+            {
+              "arguments": [
+                {
+                  "type": "LabeledArg",
+                  "label": {
+                    "commentStart": 168,
+                    "end": 174,
+                    "name": "length",
+                    "start": 168,
+                    "type": "Identifier"
+                  },
+                  "arg": {
+                    "commentStart": 175,
+                    "end": 177,
                     "raw": "10",
-                    "start": 167,
+                    "start": 175,
                     "type": "Literal",
                     "type": "Literal",
                     "value": {
@@ -357,29 +369,29 @@ expression: actual
               ],
               "callee": {
                 "abs_path": false,
-                "commentStart": 152,
+                "commentStart": 160,
-                "end": 159,
+                "end": 167,
                 "name": {
-                  "commentStart": 152,
+                  "commentStart": 160,
-                  "end": 159,
+                  "end": 167,
                   "name": "extrude",
-                  "start": 152,
+                  "start": 160,
                   "type": "Identifier"
                 },
                 "path": [],
-                "start": 152,
+                "start": 160,
                 "type": "Name"
               },
-              "commentStart": 152,
+              "commentStart": 160,
-              "end": 170,
+              "end": 178,
-              "start": 152,
+              "start": 160,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": null
             }
           ],
           "commentStart": 12,
-          "end": 170,
+          "end": 178,
           "start": 12,
           "type": "PipeExpression",
           "type": "PipeExpression"
@@ -387,7 +399,7 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 170,
+      "end": 178,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -395,6 +407,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 171,
+  "end": 179,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ad.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 5,
       "declaration": {
         "commentStart": 8,
-        "end": 51,
+        "end": 57,
         "id": {
           "commentStart": 8,
           "end": 24,
@@ -21,10 +21,10 @@ expression: actual
             "body": [
               {
                 "argument": {
-                  "commentStart": 44,
+                  "commentStart": 50,
-                  "end": 45,
+                  "end": 51,
                   "raw": "2",
-                  "start": 44,
+                  "start": 50,
                   "type": "Literal",
                   "type": "Literal",
                   "value": {
@@ -32,65 +32,65 @@ expression: actual
                     "suffix": "None"
                   }
                 },
-                "commentStart": 37,
+                "commentStart": 43,
-                "end": 45,
+                "end": 51,
-                "start": 37,
+                "start": 43,
                 "type": "ReturnStatement",
                 "type": "ReturnStatement"
               }
             ],
-            "commentStart": 27,
+            "commentStart": 33,
-            "end": 51,
+            "end": 57,
-            "start": 27
+            "start": 33
           },
-          "commentStart": 24,
+          "commentStart": 27,
-          "end": 51,
+          "end": 57,
           "params": [],
-          "start": 24,
+          "start": 27,
           "type": "FunctionExpression",
           "type": "FunctionExpression"
         },
         "start": 8,
         "type": "VariableDeclarator"
       },
-      "end": 51,
+      "end": 57,
       "kind": "fn",
       "start": 5,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 56,
+      "commentStart": 62,
-      "end": 74,
+      "end": 80,
       "expression": {
-        "arguments": [],
         "callee": {
           "abs_path": false,
-          "commentStart": 56,
+          "commentStart": 62,
-          "end": 72,
+          "end": 78,
           "name": {
-            "commentStart": 56,
+            "commentStart": 62,
-            "end": 72,
+            "end": 78,
             "name": "firstPrimeNumber",
-            "start": 56,
+            "start": 62,
             "type": "Identifier"
           },
           "path": [],
-          "start": 56,
+          "start": 62,
           "type": "Name"
         },
-        "commentStart": 56,
+        "commentStart": 62,
-        "end": 74,
+        "end": 80,
-        "start": 56,
+        "start": 62,
-        "type": "CallExpression",
+        "type": "CallExpressionKw",
-        "type": "CallExpression"
+        "type": "CallExpressionKw",
+        "unlabeled": null
       },
-      "start": 56,
+      "start": 62,
       "type": "ExpressionStatement",
       "type": "ExpressionStatement"
     }
   ],
   "commentStart": 0,
-  "end": 74,
+  "end": 80,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ae.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 3,
-        "end": 43,
+        "end": 49,
         "id": {
           "commentStart": 3,
           "end": 8,
@@ -21,94 +21,92 @@ expression: actual
             "body": [
               {
                 "argument": {
-                  "commentStart": 33,
+                  "commentStart": 39,
-                  "end": 37,
+                  "end": 43,
                   "raw": "true",
-                  "start": 33,
+                  "start": 39,
                   "type": "Literal",
                   "type": "Literal",
                   "value": true
                 },
-                "commentStart": 26,
+                "commentStart": 32,
-                "end": 37,
+                "end": 43,
-                "start": 26,
+                "start": 32,
                 "type": "ReturnStatement",
                 "type": "ReturnStatement"
               }
             ],
-            "commentStart": 16,
+            "commentStart": 22,
-            "end": 43,
+            "end": 49,
-            "start": 16
+            "start": 22
           },
-          "commentStart": 8,
+          "commentStart": 11,
-          "end": 43,
+          "end": 49,
           "params": [
             {
               "type": "Parameter",
               "identifier": {
-                "commentStart": 9,
+                "commentStart": 12,
-                "end": 14,
+                "end": 17,
                 "name": "param",
-                "start": 9,
+                "start": 12,
                 "type": "Identifier"
               }
             }
           ],
-          "start": 8,
+          "start": 11,
           "type": "FunctionExpression",
           "type": "FunctionExpression"
         },
         "start": 3,
         "type": "VariableDeclarator"
       },
-      "end": 43,
+      "end": 49,
       "kind": "fn",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 48,
+      "commentStart": 54,
-      "end": 60,
+      "end": 66,
       "expression": {
-        "arguments": [
-          {
-            "commentStart": 54,
-            "end": 59,
-            "raw": "false",
-            "start": 54,
-            "type": "Literal",
-            "type": "Literal",
-            "value": false
-          }
-        ],
         "callee": {
           "abs_path": false,
-          "commentStart": 48,
+          "commentStart": 54,
-          "end": 53,
+          "end": 59,
           "name": {
-            "commentStart": 48,
+            "commentStart": 54,
-            "end": 53,
+            "end": 59,
             "name": "thing",
-            "start": 48,
+            "start": 54,
             "type": "Identifier"
           },
           "path": [],
-          "start": 48,
+          "start": 54,
           "type": "Name"
         },
-        "commentStart": 48,
+        "commentStart": 54,
-        "end": 60,
+        "end": 66,
-        "start": 48,
+        "start": 54,
-        "type": "CallExpression",
+        "type": "CallExpressionKw",
-        "type": "CallExpression"
+        "type": "CallExpressionKw",
+        "unlabeled": {
+          "commentStart": 60,
+          "end": 65,
+          "raw": "false",
+          "start": 60,
+          "type": "Literal",
+          "type": "Literal",
+          "value": false
+        }
       },
-      "start": 48,
+      "start": 54,
       "type": "ExpressionStatement",
       "type": "ExpressionStatement"
     }
   ],
   "commentStart": 0,
-  "end": 60,
+  "end": 66,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__af.snap

@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 25,
-                  "end": 27,
-                  "name": {
-                    "commentStart": 25,
-                    "end": 27,
-                    "name": "XY",
-                    "start": 25,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 25,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 11,
@@ -55,60 +37,79 @@ expression: actual
               "commentStart": 11,
               "end": 28,
               "start": 11,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 25,
+                "end": 27,
+                "name": {
+                  "commentStart": 25,
+                  "end": 27,
+                  "name": "XY",
+                  "start": 25,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 25,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [
                 {
-                  "commentStart": 55,
+                  "type": "LabeledArg",
-                  "elements": [
+                  "label": {
-                    {
+                    "commentStart": 55,
-                      "commentStart": 56,
+                    "end": 57,
-                      "end": 57,
+                    "name": "at",
-                      "raw": "0",
+                    "start": 55,
-                      "start": 56,
+                    "type": "Identifier"
-                      "type": "Literal",
+                  },
-                      "type": "Literal",
+                  "arg": {
-                      "value": {
+                    "commentStart": 58,
-                        "value": 0.0,
+                    "elements": [
-                        "suffix": "None"
+                      {
+                        "commentStart": 59,
+                        "end": 60,
+                        "raw": "0",
+                        "start": 59,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
+                      },
+                      {
+                        "commentStart": 61,
+                        "end": 62,
+                        "raw": "0",
+                        "start": 61,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
                       }
-                    },
+                    ],
-                    {
+                    "end": 63,
-                      "commentStart": 58,
+                    "start": 58,
-                      "end": 59,
+                    "type": "ArrayExpression",
-                      "raw": "0",
+                    "type": "ArrayExpression"
-                      "start": 58,
+                  }
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 0.0,
-                        "suffix": "None"
-                      }
-                    }
-                  ],
-                  "end": 60,
-                  "start": 55,
-                  "type": "ArrayExpression",
-                  "type": "ArrayExpression"
-                },
-                {
-                  "commentStart": 62,
-                  "end": 63,
-                  "start": 62,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
                 }
               ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 40,
-                "end": 54,
+                "end": 52,
                 "name": {
                   "commentStart": 40,
-                  "end": 54,
+                  "end": 52,
-                  "name": "startProfileAt",
+                  "name": "startProfile",
                   "start": 40,
                   "type": "Identifier"
                 },
@@ -119,8 +120,15 @@ expression: actual
               "commentStart": 40,
               "end": 64,
               "start": 40,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "commentStart": 53,
+                "end": 54,
+                "start": 53,
+                "type": "PipeSubstitution",
+                "type": "PipeSubstitution"
+              }
             },
             {
               "arguments": [
@@ -363,7 +371,6 @@ expression: actual
               "unlabeled": null
             },
             {
-              "arguments": [],
               "callee": {
                 "abs_path": false,
                 "commentStart": 223,
@@ -382,8 +389,9 @@ expression: actual
               "commentStart": 223,
               "end": 230,
               "start": 223,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             }
           ],
           "commentStart": 11,

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ag.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 97,
+        "end": 95,
         "id": {
           "commentStart": 0,
           "end": 8,
@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 25,
-                  "end": 27,
-                  "name": {
-                    "commentStart": 25,
-                    "end": 27,
-                    "name": "XY",
-                    "start": 25,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 25,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 11,
@@ -55,60 +37,79 @@ expression: actual
               "commentStart": 11,
               "end": 28,
               "start": 11,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 25,
+                "end": 27,
+                "name": {
+                  "commentStart": 25,
+                  "end": 27,
+                  "name": "XY",
+                  "start": 25,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 25,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [
                 {
-                  "commentStart": 47,
+                  "type": "LabeledArg",
-                  "elements": [
+                  "label": {
-                    {
+                    "commentStart": 45,
-                      "commentStart": 48,
+                    "end": 47,
-                      "end": 49,
+                    "name": "at",
-                      "raw": "0",
+                    "start": 45,
-                      "start": 48,
+                    "type": "Identifier"
-                      "type": "Literal",
+                  },
-                      "type": "Literal",
+                  "arg": {
-                      "value": {
+                    "commentStart": 48,
-                        "value": 0.0,
+                    "elements": [
-                        "suffix": "None"
+                      {
+                        "commentStart": 49,
+                        "end": 50,
+                        "raw": "0",
+                        "start": 49,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
+                      },
+                      {
+                        "commentStart": 51,
+                        "end": 52,
+                        "raw": "0",
+                        "start": 51,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
                       }
-                    },
+                    ],
-                    {
+                    "end": 53,
-                      "commentStart": 50,
+                    "start": 48,
-                      "end": 51,
+                    "type": "ArrayExpression",
-                      "raw": "0",
+                    "type": "ArrayExpression"
-                      "start": 50,
+                  }
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 0.0,
-                        "suffix": "None"
-                      }
-                    }
-                  ],
-                  "end": 52,
-                  "start": 47,
-                  "type": "ArrayExpression",
-                  "type": "ArrayExpression"
-                },
-                {
-                  "commentStart": 54,
-                  "end": 55,
-                  "start": 54,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
                 }
               ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 32,
-                "end": 46,
+                "end": 44,
                 "name": {
                   "commentStart": 32,
-                  "end": 46,
+                  "end": 44,
-                  "name": "startProfileAt",
+                  "name": "startProfile",
                   "start": 32,
                   "type": "Identifier"
                 },
@@ -117,30 +118,31 @@ expression: actual
                 "type": "Name"
               },
               "commentStart": 32,
-              "end": 56,
+              "end": 54,
               "start": 32,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             },
             {
               "arguments": [
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "commentStart": 65,
+                    "commentStart": 63,
-                    "end": 76,
+                    "end": 74,
                     "name": "endAbsolute",
-                    "start": 65,
+                    "start": 63,
                     "type": "Identifier"
                   },
                   "arg": {
-                    "commentStart": 79,
+                    "commentStart": 77,
                     "elements": [
                       {
-                        "commentStart": 80,
+                        "commentStart": 78,
-                        "end": 81,
+                        "end": 79,
                         "raw": "1",
-                        "start": 80,
+                        "start": 78,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -149,10 +151,10 @@ expression: actual
                         }
                       },
                       {
-                        "commentStart": 83,
+                        "commentStart": 81,
-                        "end": 84,
+                        "end": 82,
                         "raw": "1",
-                        "start": 83,
+                        "start": 81,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -161,8 +163,8 @@ expression: actual
                         }
                       }
                     ],
-                    "end": 85,
+                    "end": 83,
-                    "start": 79,
+                    "start": 77,
                     "type": "ArrayExpression",
                     "type": "ArrayExpression"
                   }
@@ -170,52 +172,52 @@ expression: actual
               ],
               "callee": {
                 "abs_path": false,
-                "commentStart": 60,
+                "commentStart": 58,
-                "end": 64,
+                "end": 62,
                 "name": {
-                  "commentStart": 60,
+                  "commentStart": 58,
-                  "end": 64,
+                  "end": 62,
                   "name": "line",
-                  "start": 60,
+                  "start": 58,
                   "type": "Identifier"
                 },
                 "path": [],
-                "start": 60,
+                "start": 58,
                 "type": "Name"
               },
-              "commentStart": 60,
+              "commentStart": 58,
-              "end": 86,
+              "end": 84,
-              "start": 60,
+              "start": 58,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": null
             },
             {
-              "arguments": [],
               "callee": {
                 "abs_path": false,
-                "commentStart": 90,
+                "commentStart": 88,
-                "end": 95,
+                "end": 93,
                 "name": {
-                  "commentStart": 90,
+                  "commentStart": 88,
-                  "end": 95,
+                  "end": 93,
                   "name": "close",
-                  "start": 90,
+                  "start": 88,
                   "type": "Identifier"
                 },
                 "path": [],
-                "start": 90,
+                "start": 88,
                 "type": "Name"
               },
-              "commentStart": 90,
+              "commentStart": 88,
-              "end": 97,
+              "end": 95,
-              "start": 90,
+              "start": 88,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             }
           ],
           "commentStart": 11,
-          "end": 97,
+          "end": 95,
           "start": 11,
           "type": "PipeExpression",
           "type": "PipeExpression"
@@ -223,7 +225,7 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 97,
+      "end": 95,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -231,6 +233,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 97,
+  "end": 95,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ah.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 49,
+        "end": 46,
         "id": {
           "commentStart": 0,
           "end": 5,
@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 22,
-                  "end": 24,
-                  "name": {
-                    "commentStart": 22,
-                    "end": 24,
-                    "name": "XY",
-                    "start": 22,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 22,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 8,
@@ -55,35 +37,26 @@ expression: actual
               "commentStart": 8,
               "end": 25,
               "start": 8,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 22,
+                "end": 24,
+                "name": {
+                  "commentStart": 22,
+                  "end": 24,
+                  "name": "XY",
+                  "start": 22,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 22,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 44,
-                  "end": 45,
-                  "name": {
-                    "commentStart": 44,
-                    "end": 45,
-                    "name": "p",
-                    "start": 44,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 44,
-                  "type": "Name",
-                  "type": "Name"
-                },
-                {
-                  "commentStart": 47,
-                  "end": 48,
-                  "start": 47,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 29,
@@ -100,14 +73,30 @@ expression: actual
                 "type": "Name"
               },
               "commentStart": 29,
-              "end": 49,
+              "end": 46,
               "start": 29,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 44,
+                "end": 45,
+                "name": {
+                  "commentStart": 44,
+                  "end": 45,
+                  "name": "p",
+                  "start": 44,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 44,
+                "type": "Name",
+                "type": "Name"
+              }
             }
           ],
           "commentStart": 8,
-          "end": 49,
+          "end": 46,
           "start": 8,
           "type": "PipeExpression",
           "type": "PipeExpression"
@@ -115,7 +104,7 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 49,
+      "end": 46,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -123,6 +112,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 49,
+  "end": 46,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ai.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 23,
+        "end": 27,
         "id": {
           "commentStart": 0,
           "end": 5,
@@ -19,20 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "commentStart": 10,
-                  "end": 11,
-                  "raw": "1",
-                  "start": 10,
-                  "type": "Literal",
-                  "type": "Literal",
-                  "value": {
-                    "value": 1.0,
-                    "suffix": "None"
-                  }
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 8,
@@ -51,29 +37,39 @@ expression: actual
               "commentStart": 8,
               "end": 12,
               "start": 8,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "commentStart": 10,
+                "end": 11,
+                "raw": "1",
+                "start": 10,
+                "type": "Literal",
+                "type": "Literal",
+                "value": {
+                  "value": 1.0,
+                  "suffix": "None"
+                }
+              }
             },
             {
               "arguments": [
                 {
-                  "commentStart": 18,
+                  "type": "LabeledArg",
-                  "end": 19,
+                  "label": {
-                  "raw": "2",
+                    "commentStart": 21,
-                  "start": 18,
+                    "end": 24,
-                  "type": "Literal",
+                    "name": "arg",
-                  "type": "Literal",
+                    "start": 21,
-                  "value": {
+                    "type": "Identifier"
-                    "value": 2.0,
+                  },
-                    "suffix": "None"
+                  "arg": {
+                    "commentStart": 25,
+                    "end": 26,
+                    "start": 25,
+                    "type": "PipeSubstitution",
+                    "type": "PipeSubstitution"
                   }
-                },
-                {
-                  "commentStart": 21,
-                  "end": 22,
-                  "start": 21,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
                 }
               ],
               "callee": {
@@ -92,14 +88,26 @@ expression: actual
                 "type": "Name"
               },
               "commentStart": 16,
-              "end": 23,
+              "end": 27,
               "start": 16,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "commentStart": 18,
+                "end": 19,
+                "raw": "2",
+                "start": 18,
+                "type": "Literal",
+                "type": "Literal",
+                "value": {
+                  "value": 2.0,
+                  "suffix": "None"
+                }
+              }
             }
           ],
           "commentStart": 8,
-          "end": 23,
+          "end": 27,
           "start": 8,
           "type": "PipeExpression",
           "type": "PipeExpression"
@@ -107,7 +115,7 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 23,
+      "end": 27,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -115,6 +123,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 23,
+  "end": 27,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__aj.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 71,
+        "end": 72,
         "id": {
           "commentStart": 0,
           "end": 5,
@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 22,
-                  "end": 24,
-                  "name": {
-                    "commentStart": 22,
-                    "end": 24,
-                    "name": "XY",
-                    "start": 22,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 22,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 8,
@@ -55,43 +37,62 @@ expression: actual
               "commentStart": 8,
               "end": 25,
               "start": 8,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 22,
+                "end": 24,
+                "name": {
+                  "commentStart": 22,
+                  "end": 24,
+                  "name": "XY",
+                  "start": 22,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 22,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [
                 {
-                  "abs_path": false,
+                  "type": "LabeledArg",
-                  "commentStart": 44,
+                  "label": {
-                  "end": 45,
+                    "commentStart": 45,
-                  "name": {
+                    "end": 47,
-                    "commentStart": 44,
+                    "name": "at",
-                    "end": 45,
+                    "start": 45,
-                    "name": "p",
-                    "start": 44,
                     "type": "Identifier"
                   },
-                  "path": [],
+                  "arg": {
-                  "start": 44,
+                    "abs_path": false,
-                  "type": "Name",
+                    "commentStart": 48,
-                  "type": "Name"
+                    "end": 49,
-                },
+                    "name": {
-                {
+                      "commentStart": 48,
-                  "commentStart": 47,
+                      "end": 49,
-                  "end": 48,
+                      "name": "p",
-                  "start": 47,
+                      "start": 48,
-                  "type": "PipeSubstitution",
+                      "type": "Identifier"
-                  "type": "PipeSubstitution"
+                    },
+                    "path": [],
+                    "start": 48,
+                    "type": "Name",
+                    "type": "Name"
+                  }
                 }
               ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 29,
-                "end": 43,
+                "end": 41,
                 "name": {
                   "commentStart": 29,
-                  "end": 43,
+                  "end": 41,
-                  "name": "startProfileAt",
+                  "name": "startProfile",
                   "start": 29,
                   "type": "Identifier"
                 },
@@ -100,30 +101,37 @@ expression: actual
                 "type": "Name"
               },
               "commentStart": 29,
-              "end": 49,
+              "end": 50,
               "start": 29,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "commentStart": 42,
+                "end": 43,
+                "start": 42,
+                "type": "PipeSubstitution",
+                "type": "PipeSubstitution"
+              }
             },
             {
               "arguments": [
                 {
                   "type": "LabeledArg",
                   "label": {
-                    "commentStart": 58,
+                    "commentStart": 59,
-                    "end": 61,
+                    "end": 62,
                     "name": "end",
-                    "start": 58,
+                    "start": 59,
                     "type": "Identifier"
                   },
                   "arg": {
-                    "commentStart": 64,
+                    "commentStart": 65,
                     "elements": [
                       {
-                        "commentStart": 65,
+                        "commentStart": 66,
-                        "end": 66,
+                        "end": 67,
                         "raw": "0",
-                        "start": 65,
+                        "start": 66,
                         "type": "Literal",
                         "type": "Literal",
                         "value": {
@@ -133,23 +141,23 @@ expression: actual
                       },
                       {
                         "abs_path": false,
-                        "commentStart": 68,
+                        "commentStart": 69,
-                        "end": 69,
+                        "end": 70,
                         "name": {
-                          "commentStart": 68,
+                          "commentStart": 69,
-                          "end": 69,
+                          "end": 70,
                           "name": "l",
-                          "start": 68,
+                          "start": 69,
                           "type": "Identifier"
                         },
                         "path": [],
-                        "start": 68,
+                        "start": 69,
                         "type": "Name",
                         "type": "Name"
                       }
                     ],
-                    "end": 70,
+                    "end": 71,
-                    "start": 64,
+                    "start": 65,
                     "type": "ArrayExpression",
                     "type": "ArrayExpression"
                   }
@@ -157,29 +165,29 @@ expression: actual
               ],
               "callee": {
                 "abs_path": false,
-                "commentStart": 53,
+                "commentStart": 54,
-                "end": 57,
+                "end": 58,
                 "name": {
-                  "commentStart": 53,
+                  "commentStart": 54,
-                  "end": 57,
+                  "end": 58,
                   "name": "line",
-                  "start": 53,
+                  "start": 54,
                   "type": "Identifier"
                 },
                 "path": [],
-                "start": 53,
+                "start": 54,
                 "type": "Name"
               },
-              "commentStart": 53,
+              "commentStart": 54,
-              "end": 71,
+              "end": 72,
-              "start": 53,
+              "start": 54,
               "type": "CallExpressionKw",
               "type": "CallExpressionKw",
               "unlabeled": null
             }
           ],
           "commentStart": 8,
-          "end": 71,
+          "end": 72,
           "start": 8,
           "type": "PipeExpression",
           "type": "PipeExpression"
@@ -187,7 +195,7 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 71,
+      "end": 72,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -195,6 +203,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 71,
+  "end": 72,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ap.snap

@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 25,
-                  "end": 27,
-                  "name": {
-                    "commentStart": 25,
-                    "end": 27,
-                    "name": "XY",
-                    "start": 25,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 25,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 11,
@@ -55,60 +37,79 @@ expression: actual
               "commentStart": 11,
               "end": 28,
               "start": 11,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 25,
+                "end": 27,
+                "name": {
+                  "commentStart": 25,
+                  "end": 27,
+                  "name": "XY",
+                  "start": 25,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 25,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [
                 {
-                  "commentStart": 47,
+                  "type": "LabeledArg",
-                  "elements": [
+                  "label": {
-                    {
+                    "commentStart": 45,
-                      "commentStart": 48,
+                    "end": 47,
-                      "end": 49,
+                    "name": "at",
-                      "raw": "0",
+                    "start": 45,
-                      "start": 48,
+                    "type": "Identifier"
-                      "type": "Literal",
+                  },
-                      "type": "Literal",
+                  "arg": {
-                      "value": {
+                    "commentStart": 50,
-                        "value": 0.0,
+                    "elements": [
-                        "suffix": "None"
+                      {
+                        "commentStart": 51,
+                        "end": 52,
+                        "raw": "0",
+                        "start": 51,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
+                      },
+                      {
+                        "commentStart": 53,
+                        "end": 54,
+                        "raw": "0",
+                        "start": 53,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
                       }
-                    },
+                    ],
-                    {
+                    "end": 55,
-                      "commentStart": 50,
+                    "start": 50,
-                      "end": 51,
+                    "type": "ArrayExpression",
-                      "raw": "0",
+                    "type": "ArrayExpression"
-                      "start": 50,
+                  }
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 0.0,
-                        "suffix": "None"
-                      }
-                    }
-                  ],
-                  "end": 52,
-                  "start": 47,
-                  "type": "ArrayExpression",
-                  "type": "ArrayExpression"
-                },
-                {
-                  "commentStart": 54,
-                  "end": 55,
-                  "start": 54,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
                 }
               ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 32,
-                "end": 46,
+                "end": 44,
                 "name": {
                   "commentStart": 32,
-                  "end": 46,
+                  "end": 44,
-                  "name": "startProfileAt",
+                  "name": "startProfile",
                   "start": 32,
                   "type": "Identifier"
                 },
@@ -119,8 +120,9 @@ expression: actual
               "commentStart": 32,
               "end": 56,
               "start": 32,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             }
           ],
           "commentStart": 11,

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__aq.snap

@@ -6,45 +6,53 @@ expression: actual
   "body": [
     {
       "commentStart": 0,
-      "end": 28,
+      "end": 37,
       "expression": {
         "arguments": [
           {
-            "commentStart": 4,
+            "type": "LabeledArg",
-            "end": 5,
+            "label": {
-            "raw": "5",
+              "commentStart": 7,
-            "start": 4,
+              "end": 10,
-            "type": "Literal",
+              "name": "arg",
-            "type": "Literal",
+              "start": 7,
-            "value": {
+              "type": "Identifier"
-              "value": 5.0,
+            },
-              "suffix": "None"
+            "arg": {
+              "commentStart": 11,
+              "end": 18,
+              "raw": "\"hello\"",
+              "start": 11,
+              "type": "Literal",
+              "type": "Literal",
+              "value": "hello"
             }
           },
           {
-            "commentStart": 7,
+            "type": "LabeledArg",
-            "end": 14,
+            "label": {
-            "raw": "\"hello\"",
+              "commentStart": 20,
-            "start": 7,
+              "end": 24,
-            "type": "Literal",
+              "name": "arg2",
-            "type": "Literal",
+              "start": 20,
-            "value": "hello"
-          },
-          {
-            "abs_path": false,
-            "commentStart": 16,
-            "end": 27,
-            "name": {
-              "commentStart": 16,
-              "end": 27,
-              "name": "aIdentifier",
-              "start": 16,
               "type": "Identifier"
             },
-            "path": [],
+            "arg": {
-            "start": 16,
+              "abs_path": false,
-            "type": "Name",
+              "commentStart": 25,
-            "type": "Name"
+              "end": 36,
+              "name": {
+                "commentStart": 25,
+                "end": 36,
+                "name": "aIdentifier",
+                "start": 25,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 25,
+              "type": "Name",
+              "type": "Name"
+            }
           }
         ],
         "callee": {
@@ -63,10 +71,22 @@ expression: actual
           "type": "Name"
         },
         "commentStart": 0,
-        "end": 28,
+        "end": 37,
         "start": 0,
-        "type": "CallExpression",
+        "type": "CallExpressionKw",
-        "type": "CallExpression"
+        "type": "CallExpressionKw",
+        "unlabeled": {
+          "commentStart": 4,
+          "end": 5,
+          "raw": "5",
+          "start": 4,
+          "type": "Literal",
+          "type": "Literal",
+          "value": {
+            "value": 5.0,
+            "suffix": "None"
+          }
+        }
       },
       "start": 0,
       "type": "ExpressionStatement",
@@ -74,6 +94,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 28,
+  "end": 37,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__at.snap

@@ -6,52 +6,55 @@ expression: actual
   "body": [
     {
       "commentStart": 0,
-      "end": 15,
+      "end": 21,
       "expression": {
         "arguments": [
           {
-            "commentStart": 5,
+            "type": "LabeledArg",
-            "elements": [
+            "label": {
-              {
+              "commentStart": 8,
-                "commentStart": 6,
+              "end": 11,
-                "end": 7,
+              "name": "end",
-                "raw": "0",
+              "start": 8,
-                "start": 6,
+              "type": "Identifier"
-                "type": "Literal",
+            },
-                "type": "Literal",
+            "arg": {
-                "value": {
+              "commentStart": 14,
-                  "value": 0.0,
+              "elements": [
-                  "suffix": "None"
+                {
-                }
+                  "commentStart": 15,
-              },
+                  "end": 16,
-              {
+                  "raw": "0",
-                "abs_path": false,
+                  "start": 15,
-                "commentStart": 9,
+                  "type": "Literal",
-                "end": 10,
+                  "type": "Literal",
-                "name": {
+                  "value": {
-                  "commentStart": 9,
+                    "value": 0.0,
-                  "end": 10,
+                    "suffix": "None"
-                  "name": "l",
+                  }
-                  "start": 9,
-                  "type": "Identifier"
                 },
-                "path": [],
+                {
-                "start": 9,
+                  "abs_path": false,
-                "type": "Name",
+                  "commentStart": 18,
-                "type": "Name"
+                  "end": 19,
-              }
+                  "name": {
-            ],
+                    "commentStart": 18,
-            "end": 11,
+                    "end": 19,
-            "start": 5,
+                    "name": "l",
-            "type": "ArrayExpression",
+                    "start": 18,
-            "type": "ArrayExpression"
+                    "type": "Identifier"
-          },
+                  },
-          {
+                  "path": [],
-            "commentStart": 13,
+                  "start": 18,
-            "end": 14,
+                  "type": "Name",
-            "start": 13,
+                  "type": "Name"
-            "type": "PipeSubstitution",
+                }
-            "type": "PipeSubstitution"
+              ],
+              "end": 20,
+              "start": 14,
+              "type": "ArrayExpression",
+              "type": "ArrayExpression"
+            }
           }
         ],
         "callee": {
@@ -70,10 +73,17 @@ expression: actual
           "type": "Name"
         },
         "commentStart": 0,
-        "end": 15,
+        "end": 21,
         "start": 0,
-        "type": "CallExpression",
+        "type": "CallExpressionKw",
-        "type": "CallExpression"
+        "type": "CallExpressionKw",
+        "unlabeled": {
+          "commentStart": 5,
+          "end": 6,
+          "start": 5,
+          "type": "PipeSubstitution",
+          "type": "PipeSubstitution"
+        }
       },
       "start": 0,
       "type": "ExpressionStatement",
@@ -81,6 +91,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 15,
+  "end": 21,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__au.snap

@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 25,
-                  "end": 27,
-                  "name": {
-                    "commentStart": 25,
-                    "end": 27,
-                    "name": "XY",
-                    "start": 25,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 25,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 11,
@@ -55,8 +37,24 @@ expression: actual
               "commentStart": 11,
               "end": 28,
               "start": 11,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 25,
+                "end": 27,
+                "name": {
+                  "commentStart": 25,
+                  "end": 27,
+                  "name": "XY",
+                  "start": 25,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 25,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__av.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 3,
-        "end": 43,
+        "end": 64,
         "id": {
           "commentStart": 3,
           "end": 4,
@@ -23,76 +23,93 @@ expression: actual
                 "argument": {
                   "arguments": [
                     {
-                      "abs_path": false,
+                      "type": "LabeledArg",
-                      "commentStart": 30,
+                      "label": {
-                      "end": 35,
+                        "commentStart": 36,
-                      "name": {
+                        "end": 42,
-                        "commentStart": 30,
+                        "name": "ifNone",
-                        "end": 35,
+                        "start": 36,
-                        "name": "angle",
-                        "start": 30,
                         "type": "Identifier"
                       },
-                      "path": [],
+                      "arg": {
-                      "start": 30,
+                        "commentStart": 43,
-                      "type": "Name",
+                        "end": 46,
-                      "type": "Name"
+                        "raw": "360",
+                        "start": 43,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 360.0,
+                          "suffix": "None"
+                        }
+                      }
                     },
                     {
-                      "commentStart": 37,
+                      "type": "LabeledArg",
-                      "end": 40,
+                      "label": {
-                      "raw": "360",
+                        "commentStart": 48,
-                      "start": 37,
+                        "end": 57,
-                      "type": "Literal",
+                        "name": "otherwise",
-                      "type": "Literal",
+                        "start": 48,
-                      "value": {
+                        "type": "Identifier"
-                        "value": 360.0,
+                      },
-                        "suffix": "None"
+                      "arg": {
+                        "commentStart": 58,
+                        "end": 61,
+                        "raw": "360",
+                        "start": 58,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 360.0,
+                          "suffix": "None"
+                        }
                       }
                     }
                   ],
                   "callee": {
                     "abs_path": false,
-                    "commentStart": 22,
+                    "commentStart": 28,
-                    "end": 29,
+                    "end": 35,
                     "name": {
-                      "commentStart": 22,
+                      "commentStart": 28,
-                      "end": 29,
+                      "end": 35,
                       "name": "default",
-                      "start": 22,
+                      "start": 28,
                       "type": "Identifier"
                     },
                     "path": [],
-                    "start": 22,
+                    "start": 28,
                     "type": "Name"
                   },
-                  "commentStart": 22,
+                  "commentStart": 28,
-                  "end": 41,
+                  "end": 62,
-                  "start": 22,
+                  "start": 28,
-                  "type": "CallExpression",
+                  "type": "CallExpressionKw",
-                  "type": "CallExpression"
+                  "type": "CallExpressionKw",
+                  "unlabeled": null
                 },
-                "commentStart": 15,
+                "commentStart": 21,
-                "end": 41,
+                "end": 62,
-                "start": 15,
+                "start": 21,
                 "type": "ReturnStatement",
                 "type": "ReturnStatement"
               }
             ],
-            "commentStart": 13,
+            "commentStart": 19,
-            "end": 43,
+            "end": 64,
-            "start": 13
+            "start": 19
           },
-          "commentStart": 4,
+          "commentStart": 7,
-          "end": 43,
+          "end": 64,
           "params": [
             {
               "type": "Parameter",
               "identifier": {
-                "commentStart": 5,
+                "commentStart": 8,
-                "end": 10,
+                "end": 13,
                 "name": "angle",
-                "start": 5,
+                "start": 8,
                 "type": "Identifier"
               },
               "default_value": {
@@ -102,14 +119,14 @@ expression: actual
               }
             }
           ],
-          "start": 4,
+          "start": 7,
           "type": "FunctionExpression",
           "type": "FunctionExpression"
         },
         "start": 3,
         "type": "VariableDeclarator"
       },
-      "end": 43,
+      "end": 64,
       "kind": "fn",
       "start": 0,
       "type": "VariableDeclaration",
@@ -117,6 +134,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 43,
+  "end": 64,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__aw.snap

@@ -7,23 +7,23 @@ expression: actual
     {
       "commentStart": 0,
       "declaration": {
-        "commentStart": 0,
+        "commentStart": 4,
-        "end": 87,
+        "end": 91,
         "id": {
-          "commentStart": 0,
+          "commentStart": 4,
-          "end": 7,
+          "end": 11,
           "name": "numbers",
-          "start": 0,
+          "start": 4,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 10,
+          "commentStart": 14,
           "elements": [
             {
-              "commentStart": 24,
+              "commentStart": 28,
-              "end": 25,
+              "end": 29,
               "raw": "1",
-              "start": 24,
+              "start": 28,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -32,10 +32,10 @@ expression: actual
               }
             },
             {
-              "commentStart": 75,
+              "commentStart": 79,
-              "end": 76,
+              "end": 80,
               "raw": "3",
-              "start": 75,
+              "start": 79,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -44,14 +44,14 @@ expression: actual
               }
             }
           ],
-          "end": 87,
+          "end": 91,
           "nonCodeMeta": {
             "nonCodeNodes": {
               "1": [
                 {
-                  "commentStart": 39,
+                  "commentStart": 43,
-                  "end": 44,
+                  "end": 48,
-                  "start": 39,
+                  "start": 43,
                   "type": "NonCodeNode",
                   "value": {
                     "type": "blockComment",
@@ -62,9 +62,9 @@ expression: actual
               ],
               "2": [
                 {
-                  "commentStart": 57,
+                  "commentStart": 61,
-                  "end": 62,
+                  "end": 66,
-                  "start": 57,
+                  "start": 61,
                   "type": "NonCodeNode",
                   "value": {
                     "type": "blockComment",
@@ -76,14 +76,14 @@ expression: actual
             },
             "startNodes": []
           },
-          "start": 10,
+          "start": 14,
           "type": "ArrayExpression",
           "type": "ArrayExpression"
         },
-        "start": 0,
+        "start": 4,
         "type": "VariableDeclarator"
       },
-      "end": 87,
+      "end": 91,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -91,6 +91,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 87,
+  "end": 91,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__ax.snap

@@ -7,23 +7,23 @@ expression: actual
     {
       "commentStart": 0,
       "declaration": {
-        "commentStart": 0,
+        "commentStart": 4,
-        "end": 87,
+        "end": 91,
         "id": {
-          "commentStart": 0,
+          "commentStart": 4,
-          "end": 7,
+          "end": 11,
           "name": "numbers",
-          "start": 0,
+          "start": 4,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 10,
+          "commentStart": 14,
           "elements": [
             {
-              "commentStart": 24,
+              "commentStart": 28,
-              "end": 25,
+              "end": 29,
               "raw": "1",
-              "start": 24,
+              "start": 28,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -32,10 +32,10 @@ expression: actual
               }
             },
             {
-              "commentStart": 39,
+              "commentStart": 43,
-              "end": 40,
+              "end": 44,
               "raw": "2",
-              "start": 39,
+              "start": 43,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -44,14 +44,14 @@ expression: actual
               }
             }
           ],
-          "end": 87,
+          "end": 91,
           "nonCodeMeta": {
             "nonCodeNodes": {
               "2": [
                 {
-                  "commentStart": 54,
+                  "commentStart": 58,
-                  "end": 59,
+                  "end": 63,
-                  "start": 54,
+                  "start": 58,
                   "type": "NonCodeNode",
                   "value": {
                     "type": "blockComment",
@@ -62,9 +62,9 @@ expression: actual
               ],
               "3": [
                 {
-                  "commentStart": 72,
+                  "commentStart": 76,
-                  "end": 77,
+                  "end": 81,
-                  "start": 72,
+                  "start": 76,
                   "type": "NonCodeNode",
                   "value": {
                     "type": "blockComment",
@@ -76,14 +76,14 @@ expression: actual
             },
             "startNodes": []
           },
-          "start": 10,
+          "start": 14,
           "type": "ArrayExpression",
           "type": "ArrayExpression"
         },
-        "start": 0,
+        "start": 4,
         "type": "VariableDeclarator"
       },
-      "end": 87,
+      "end": 91,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -91,6 +91,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 87,
+  "end": 91,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__az.snap

@@ -7,25 +7,25 @@ expression: actual
     {
       "commentStart": 0,
       "declaration": {
-        "commentStart": 0,
+        "commentStart": 4,
-        "end": 75,
+        "end": 79,
         "id": {
-          "commentStart": 0,
+          "commentStart": 4,
-          "end": 5,
+          "end": 9,
           "name": "props",
-          "start": 0,
+          "start": 4,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 8,
+          "commentStart": 12,
-          "end": 75,
+          "end": 79,
           "nonCodeMeta": {
             "nonCodeNodes": {
               "1": [
                 {
-                  "commentStart": 40,
+                  "commentStart": 44,
-                  "end": 48,
+                  "end": 52,
-                  "start": 40,
+                  "start": 44,
                   "type": "NonCodeNode",
                   "value": {
                     "type": "blockComment",
@@ -39,22 +39,22 @@ expression: actual
           },
           "properties": [
             {
-              "commentStart": 22,
+              "commentStart": 26,
-              "end": 26,
+              "end": 30,
               "key": {
-                "commentStart": 22,
+                "commentStart": 26,
-                "end": 23,
+                "end": 27,
                 "name": "a",
-                "start": 22,
+                "start": 26,
                 "type": "Identifier"
               },
-              "start": 22,
+              "start": 26,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 25,
+                "commentStart": 29,
-                "end": 26,
+                "end": 30,
                 "raw": "1",
-                "start": 25,
+                "start": 29,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -64,22 +64,22 @@ expression: actual
               }
             },
             {
-              "commentStart": 61,
+              "commentStart": 65,
-              "end": 65,
+              "end": 69,
               "key": {
-                "commentStart": 61,
+                "commentStart": 65,
-                "end": 62,
+                "end": 66,
                 "name": "c",
-                "start": 61,
+                "start": 65,
                 "type": "Identifier"
               },
-              "start": 61,
+              "start": 65,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 64,
+                "commentStart": 68,
-                "end": 65,
+                "end": 69,
                 "raw": "3",
-                "start": 64,
+                "start": 68,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -89,14 +89,14 @@ expression: actual
               }
             }
           ],
-          "start": 8,
+          "start": 12,
           "type": "ObjectExpression",
           "type": "ObjectExpression"
         },
-        "start": 0,
+        "start": 4,
         "type": "VariableDeclarator"
       },
-      "end": 75,
+      "end": 79,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -104,6 +104,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 75,
+  "end": 79,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__b.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 30,
+        "end": 26,
         "id": {
           "commentStart": 0,
           "end": 5,
@@ -19,72 +19,48 @@ expression: actual
         "init": {
           "arguments": [
             {
-              "commentStart": 12,
+              "type": "LabeledArg",
-              "end": 13,
+              "label": {
-              "raw": "5",
+                "commentStart": 12,
-              "start": 12,
+                "end": 13,
-              "type": "Literal",
+                "name": "x",
-              "type": "Literal",
+                "start": 12,
-              "value": {
+                "type": "Identifier"
-                "value": 5.0,
+              },
-                "suffix": "None"
+              "arg": {
+                "commentStart": 16,
+                "end": 17,
+                "raw": "5",
+                "start": 16,
+                "type": "Literal",
+                "type": "Literal",
+                "value": {
+                  "value": 5.0,
+                  "suffix": "None"
+                }
               }
             },
             {
-              "argument": {
+              "type": "LabeledArg",
-                "arguments": [
+              "label": {
-                  {
+                "commentStart": 20,
-                    "commentStart": 24,
+                "end": 21,
-                    "end": 25,
+                "name": "y",
-                    "raw": "5",
+                "start": 20,
-                    "start": 24,
+                "type": "Identifier"
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 5.0,
-                      "suffix": "None"
-                    }
-                  },
-                  {
-                    "commentStart": 27,
-                    "end": 28,
-                    "raw": "4",
-                    "start": 27,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 4.0,
-                      "suffix": "None"
-                    }
-                  }
-                ],
-                "callee": {
-                  "abs_path": false,
-                  "commentStart": 17,
-                  "end": 23,
-                  "name": {
-                    "commentStart": 17,
-                    "end": 23,
-                    "name": "legLen",
-                    "start": 17,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 17,
-                  "type": "Name"
-                },
-                "commentStart": 17,
-                "end": 29,
-                "start": 17,
-                "type": "CallExpression",
-                "type": "CallExpression"
               },
-              "commentStart": 16,
+              "arg": {
-              "end": 29,
+                "commentStart": 24,
-              "operator": "-",
+                "end": 25,
-              "start": 16,
+                "raw": "3",
-              "type": "UnaryExpression",
+                "start": 24,
-              "type": "UnaryExpression"
+                "type": "Literal",
+                "type": "Literal",
+                "value": {
+                  "value": 3.0,
+                  "suffix": "None"
+                }
+              }
             }
           ],
           "callee": {
@@ -103,15 +79,16 @@ expression: actual
             "type": "Name"
           },
           "commentStart": 8,
-          "end": 30,
+          "end": 26,
           "start": 8,
-          "type": "CallExpression",
+          "type": "CallExpressionKw",
-          "type": "CallExpression"
+          "type": "CallExpressionKw",
+          "unlabeled": null
         },
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 30,
+      "end": 26,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -119,6 +96,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 30,
+  "end": 26,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bd.snap

@@ -32,24 +32,6 @@ expression: actual
             {
               "commentStart": 38,
               "cond": {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 51,
-                    "end": 57,
-                    "name": {
-                      "commentStart": 51,
-                      "end": 57,
-                      "name": "radius",
-                      "start": 51,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 51,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 46,
@@ -68,8 +50,24 @@ expression: actual
                 "commentStart": 46,
                 "end": 58,
                 "start": 46,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 51,
+                  "end": 57,
+                  "name": {
+                    "commentStart": 51,
+                    "end": 57,
+                    "name": "radius",
+                    "start": 51,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 51,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               "digest": null,
               "end": 84,

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__be.snap

@@ -7,23 +7,23 @@ expression: actual
     {
       "commentStart": 0,
       "declaration": {
-        "commentStart": 0,
+        "commentStart": 4,
-        "end": 10,
+        "end": 14,
         "id": {
-          "commentStart": 0,
+          "commentStart": 4,
-          "end": 1,
+          "end": 5,
           "name": "x",
-          "start": 0,
+          "start": 4,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 4,
+          "commentStart": 8,
-          "end": 10,
+          "end": 14,
           "left": {
-            "commentStart": 4,
+            "commentStart": 8,
-            "end": 5,
+            "end": 9,
             "raw": "3",
-            "start": 4,
+            "start": 8,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -33,10 +33,10 @@ expression: actual
           },
           "operator": "==",
           "right": {
-            "commentStart": 9,
+            "commentStart": 13,
-            "end": 10,
+            "end": 14,
             "raw": "3",
-            "start": 9,
+            "start": 13,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -44,14 +44,14 @@ expression: actual
               "suffix": "None"
             }
           },
-          "start": 4,
+          "start": 8,
           "type": "BinaryExpression",
           "type": "BinaryExpression"
         },
-        "start": 0,
+        "start": 4,
         "type": "VariableDeclarator"
       },
-      "end": 10,
+      "end": 14,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -59,6 +59,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 10,
+  "end": 14,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bf.snap

@@ -7,23 +7,23 @@ expression: actual
     {
       "commentStart": 0,
       "declaration": {
-        "commentStart": 0,
+        "commentStart": 4,
-        "end": 10,
+        "end": 14,
         "id": {
-          "commentStart": 0,
+          "commentStart": 4,
-          "end": 1,
+          "end": 5,
           "name": "x",
-          "start": 0,
+          "start": 4,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 4,
+          "commentStart": 8,
-          "end": 10,
+          "end": 14,
           "left": {
-            "commentStart": 4,
+            "commentStart": 8,
-            "end": 5,
+            "end": 9,
             "raw": "3",
-            "start": 4,
+            "start": 8,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -33,10 +33,10 @@ expression: actual
           },
           "operator": "!=",
           "right": {
-            "commentStart": 9,
+            "commentStart": 13,
-            "end": 10,
+            "end": 14,
             "raw": "3",
-            "start": 9,
+            "start": 13,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -44,14 +44,14 @@ expression: actual
               "suffix": "None"
             }
           },
-          "start": 4,
+          "start": 8,
           "type": "BinaryExpression",
           "type": "BinaryExpression"
         },
-        "start": 0,
+        "start": 4,
         "type": "VariableDeclarator"
       },
-      "end": 10,
+      "end": 14,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -59,6 +59,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 10,
+  "end": 14,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__bi.snap

@@ -41,7 +41,7 @@ expression: actual
       "commentStart": 14,
       "declaration": {
         "commentStart": 14,
-        "end": 31,
+        "end": 30,
         "id": {
           "commentStart": 14,
           "end": 17,
@@ -51,7 +51,7 @@ expression: actual
         },
         "init": {
           "commentStart": 20,
-          "end": 31,
+          "end": 30,
           "properties": [
             {
               "commentStart": 22,
@@ -84,7 +84,7 @@ expression: actual
             },
             {
               "commentStart": 25,
-              "end": 30,
+              "end": 29,
               "key": {
                 "commentStart": 25,
                 "end": 26,
@@ -95,10 +95,10 @@ expression: actual
               "start": 25,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 29,
+                "commentStart": 28,
-                "end": 30,
+                "end": 29,
                 "raw": "4",
-                "start": 29,
+                "start": 28,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -115,7 +115,7 @@ expression: actual
         "start": 14,
         "type": "VariableDeclarator"
       },
-      "end": 31,
+      "end": 30,
       "kind": "const",
       "start": 14,
       "type": "VariableDeclaration",
@@ -123,6 +123,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 31,
+  "end": 30,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__c.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 29,
+        "end": 49,
         "id": {
           "commentStart": 0,
           "end": 5,
@@ -19,71 +19,112 @@ expression: actual
         "init": {
           "arguments": [
             {
-              "argument": {
+              "type": "LabeledArg",
-                "arguments": [
+              "label": {
-                  {
+                "commentStart": 12,
-                    "commentStart": 20,
+                "end": 13,
-                    "end": 21,
+                "name": "x",
-                    "raw": "5",
+                "start": 12,
-                    "start": 20,
+                "type": "Identifier"
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 5.0,
-                      "suffix": "None"
-                    }
-                  },
-                  {
-                    "commentStart": 23,
-                    "end": 24,
-                    "raw": "4",
-                    "start": 23,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 4.0,
-                      "suffix": "None"
-                    }
-                  }
-                ],
-                "callee": {
-                  "abs_path": false,
-                  "commentStart": 13,
-                  "end": 19,
-                  "name": {
-                    "commentStart": 13,
-                    "end": 19,
-                    "name": "legLen",
-                    "start": 13,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 13,
-                  "type": "Name"
-                },
-                "commentStart": 13,
-                "end": 25,
-                "start": 13,
-                "type": "CallExpression",
-                "type": "CallExpression"
               },
-              "commentStart": 12,
+              "arg": {
-              "end": 25,
+                "argument": {
-              "operator": "-",
+                  "arguments": [
-              "start": 12,
+                    {
-              "type": "UnaryExpression",
+                      "type": "LabeledArg",
-              "type": "UnaryExpression"
+                      "label": {
+                        "commentStart": 24,
+                        "end": 27,
+                        "name": "hyp",
+                        "start": 24,
+                        "type": "Identifier"
+                      },
+                      "arg": {
+                        "commentStart": 30,
+                        "end": 31,
+                        "raw": "5",
+                        "start": 30,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 5.0,
+                          "suffix": "None"
+                        }
+                      }
+                    },
+                    {
+                      "type": "LabeledArg",
+                      "label": {
+                        "commentStart": 33,
+                        "end": 36,
+                        "name": "pot",
+                        "start": 33,
+                        "type": "Identifier"
+                      },
+                      "arg": {
+                        "commentStart": 39,
+                        "end": 40,
+                        "raw": "4",
+                        "start": 39,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 4.0,
+                          "suffix": "None"
+                        }
+                      }
+                    }
+                  ],
+                  "callee": {
+                    "abs_path": false,
+                    "commentStart": 17,
+                    "end": 23,
+                    "name": {
+                      "commentStart": 17,
+                      "end": 23,
+                      "name": "legLen",
+                      "start": 17,
+                      "type": "Identifier"
+                    },
+                    "path": [],
+                    "start": 17,
+                    "type": "Name"
+                  },
+                  "commentStart": 17,
+                  "end": 41,
+                  "start": 17,
+                  "type": "CallExpressionKw",
+                  "type": "CallExpressionKw",
+                  "unlabeled": null
+                },
+                "commentStart": 16,
+                "end": 41,
+                "operator": "-",
+                "start": 16,
+                "type": "UnaryExpression",
+                "type": "UnaryExpression"
+              }
             },
             {
-              "commentStart": 27,
+              "type": "LabeledArg",
-              "end": 28,
+              "label": {
-              "raw": "5",
+                "commentStart": 43,
-              "start": 27,
+                "end": 44,
-              "type": "Literal",
+                "name": "y",
-              "type": "Literal",
+                "start": 43,
-              "value": {
+                "type": "Identifier"
-                "value": 5.0,
+              },
-                "suffix": "None"
+              "arg": {
+                "commentStart": 47,
+                "end": 48,
+                "raw": "5",
+                "start": 47,
+                "type": "Literal",
+                "type": "Literal",
+                "value": {
+                  "value": 5.0,
+                  "suffix": "None"
+                }
               }
             }
           ],
@@ -103,15 +144,16 @@ expression: actual
             "type": "Name"
           },
           "commentStart": 8,
-          "end": 29,
+          "end": 49,
           "start": 8,
-          "type": "CallExpression",
+          "type": "CallExpressionKw",
-          "type": "CallExpression"
+          "type": "CallExpressionKw",
+          "unlabeled": null
         },
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 29,
+      "end": 49,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -119,6 +161,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 29,
+  "end": 49,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__d.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 30,
+        "end": 34,
         "id": {
           "commentStart": 0,
           "end": 5,
@@ -53,23 +53,21 @@ expression: actual
             {
               "arguments": [
                 {
-                  "commentStart": 24,
+                  "type": "LabeledArg",
-                  "end": 26,
+                  "label": {
-                  "raw": "45",
+                    "commentStart": 28,
-                  "start": 24,
+                    "end": 29,
-                  "type": "Literal",
+                    "name": "y",
-                  "type": "Literal",
+                    "start": 28,
-                  "value": {
+                    "type": "Identifier"
-                    "value": 45.0,
+                  },
-                    "suffix": "None"
+                  "arg": {
+                    "commentStart": 32,
+                    "end": 33,
+                    "start": 32,
+                    "type": "PipeSubstitution",
+                    "type": "PipeSubstitution"
                   }
-                },
-                {
-                  "commentStart": 28,
-                  "end": 29,
-                  "start": 28,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
                 }
               ],
               "callee": {
@@ -88,14 +86,26 @@ expression: actual
                 "type": "Name"
               },
               "commentStart": 17,
-              "end": 30,
+              "end": 34,
               "start": 17,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "commentStart": 24,
+                "end": 26,
+                "raw": "45",
+                "start": 24,
+                "type": "Literal",
+                "type": "Literal",
+                "value": {
+                  "value": 45.0,
+                  "suffix": "None"
+                }
+              }
             }
           ],
           "commentStart": 8,
-          "end": 30,
+          "end": 34,
           "start": 8,
           "type": "PipeExpression",
           "type": "PipeExpression"
@@ -103,7 +113,7 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 30,
+      "end": 34,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -111,6 +121,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 30,
+  "end": 34,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__e.snap

@@ -7,23 +7,23 @@ expression: actual
     {
       "commentStart": 0,
       "declaration": {
-        "commentStart": 0,
+        "commentStart": 4,
-        "end": 14,
+        "end": 18,
         "id": {
-          "commentStart": 0,
+          "commentStart": 4,
-          "end": 1,
+          "end": 5,
           "name": "x",
-          "start": 0,
+          "start": 4,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 4,
+          "commentStart": 8,
-          "end": 14,
+          "end": 18,
           "left": {
-            "commentStart": 4,
+            "commentStart": 8,
-            "end": 5,
+            "end": 9,
             "raw": "1",
-            "start": 4,
+            "start": 8,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -33,13 +33,13 @@ expression: actual
           },
           "operator": "*",
           "right": {
-            "commentStart": 9,
+            "commentStart": 13,
-            "end": 14,
+            "end": 18,
             "left": {
-              "commentStart": 9,
+              "commentStart": 13,
-              "end": 10,
+              "end": 14,
               "raw": "3",
-              "start": 9,
+              "start": 13,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -49,10 +49,10 @@ expression: actual
             },
             "operator": "-",
             "right": {
-              "commentStart": 13,
+              "commentStart": 17,
-              "end": 14,
+              "end": 18,
               "raw": "4",
-              "start": 13,
+              "start": 17,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -60,18 +60,18 @@ expression: actual
                 "suffix": "None"
               }
             },
-            "start": 9,
+            "start": 13,
             "type": "BinaryExpression",
             "type": "BinaryExpression"
           },
-          "start": 4,
+          "start": 8,
           "type": "BinaryExpression",
           "type": "BinaryExpression"
         },
-        "start": 0,
+        "start": 4,
         "type": "VariableDeclarator"
       },
-      "end": 14,
+      "end": 18,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
@@ -79,6 +79,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 14,
+  "end": 18,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__g.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 3,
-        "end": 52,
+        "end": 58,
         "id": {
           "commentStart": 3,
           "end": 4,
@@ -22,65 +22,65 @@ expression: actual
               {
                 "argument": {
                   "abs_path": false,
-                  "commentStart": 24,
+                  "commentStart": 30,
-                  "end": 26,
+                  "end": 32,
                   "name": {
-                    "commentStart": 24,
+                    "commentStart": 30,
-                    "end": 26,
+                    "end": 32,
                     "name": "sg",
-                    "start": 24,
+                    "start": 30,
                     "type": "Identifier"
                   },
                   "path": [],
-                  "start": 24,
+                  "start": 30,
                   "type": "Name",
                   "type": "Name"
                 },
-                "commentStart": 17,
+                "commentStart": 23,
-                "end": 26,
+                "end": 32,
-                "start": 17,
+                "start": 23,
                 "type": "ReturnStatement",
                 "type": "ReturnStatement"
               },
               {
                 "argument": {
                   "abs_path": false,
-                  "commentStart": 42,
+                  "commentStart": 48,
-                  "end": 44,
+                  "end": 50,
                   "name": {
-                    "commentStart": 42,
+                    "commentStart": 48,
-                    "end": 44,
+                    "end": 50,
                     "name": "sg",
-                    "start": 42,
+                    "start": 48,
                     "type": "Identifier"
                   },
                   "path": [],
-                  "start": 42,
+                  "start": 48,
                   "type": "Name",
                   "type": "Name"
                 },
-                "commentStart": 35,
+                "commentStart": 41,
-                "end": 44,
+                "end": 50,
-                "start": 35,
+                "start": 41,
                 "type": "ReturnStatement",
                 "type": "ReturnStatement"
               }
             ],
-            "commentStart": 7,
+            "commentStart": 13,
-            "end": 52,
+            "end": 58,
-            "start": 7
+            "start": 13
           },
-          "commentStart": 4,
+          "commentStart": 7,
-          "end": 52,
+          "end": 58,
           "params": [],
-          "start": 4,
+          "start": 7,
           "type": "FunctionExpression",
           "type": "FunctionExpression"
         },
         "start": 3,
         "type": "VariableDeclarator"
       },
-      "end": 52,
+      "end": 58,
       "kind": "fn",
       "start": 0,
       "type": "VariableDeclaration",
@@ -88,6 +88,6 @@ expression: actual
     }
   ],
   "commentStart": 0,
-  "end": 52,
+  "end": 58,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__h.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 22,
+        "end": 20,
         "id": {
           "commentStart": 0,
           "end": 3,
@@ -18,11 +18,11 @@ expression: actual
         },
         "init": {
           "commentStart": 6,
-          "end": 22,
+          "end": 20,
           "properties": [
             {
               "commentStart": 8,
-              "end": 13,
+              "end": 12,
               "key": {
                 "commentStart": 8,
                 "end": 9,
@@ -33,10 +33,10 @@ expression: actual
               "start": 8,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 12,
+                "commentStart": 11,
-                "end": 13,
+                "end": 12,
                 "raw": "1",
-                "start": 12,
+                "start": 11,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -46,22 +46,22 @@ expression: actual
               }
             },
             {
-              "commentStart": 15,
+              "commentStart": 14,
-              "end": 20,
+              "end": 18,
               "key": {
-                "commentStart": 15,
+                "commentStart": 14,
-                "end": 16,
+                "end": 15,
                 "name": "b",
-                "start": 15,
+                "start": 14,
                 "type": "Identifier"
               },
-              "start": 15,
+              "start": 14,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 19,
+                "commentStart": 17,
-                "end": 20,
+                "end": 18,
                 "raw": "2",
-                "start": 19,
+                "start": 17,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -78,32 +78,32 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 22,
+      "end": 20,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 27,
+      "commentStart": 25,
       "declaration": {
-        "commentStart": 27,
+        "commentStart": 25,
-        "end": 45,
+        "end": 43,
         "id": {
-          "commentStart": 27,
+          "commentStart": 25,
-          "end": 33,
+          "end": 31,
           "name": "height",
-          "start": 27,
+          "start": 25,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 36,
+          "commentStart": 34,
-          "end": 45,
+          "end": 43,
           "left": {
-            "commentStart": 36,
+            "commentStart": 34,
-            "end": 37,
+            "end": 35,
             "raw": "1",
-            "start": 36,
+            "start": 34,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -113,44 +113,44 @@ expression: actual
           },
           "operator": "-",
           "right": {
-            "commentStart": 40,
+            "commentStart": 38,
             "computed": false,
-            "end": 45,
+            "end": 43,
             "object": {
-              "commentStart": 40,
+              "commentStart": 38,
-              "end": 43,
+              "end": 41,
               "name": "obj",
-              "start": 40,
+              "start": 38,
               "type": "Identifier",
               "type": "Identifier"
             },
             "property": {
-              "commentStart": 44,
+              "commentStart": 42,
-              "end": 45,
+              "end": 43,
               "name": "a",
-              "start": 44,
+              "start": 42,
               "type": "Identifier",
               "type": "Identifier"
             },
-            "start": 40,
+            "start": 38,
             "type": "MemberExpression",
             "type": "MemberExpression"
           },
-          "start": 36,
+          "start": 34,
           "type": "BinaryExpression",
           "type": "BinaryExpression"
         },
-        "start": 27,
+        "start": 25,
         "type": "VariableDeclarator"
       },
-      "end": 45,
+      "end": 43,
       "kind": "const",
-      "start": 27,
+      "start": 25,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     }
   ],
   "commentStart": 0,
-  "end": 45,
+  "end": 43,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__i.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 22,
+        "end": 20,
         "id": {
           "commentStart": 0,
           "end": 3,
@@ -18,11 +18,11 @@ expression: actual
         },
         "init": {
           "commentStart": 6,
-          "end": 22,
+          "end": 20,
           "properties": [
             {
               "commentStart": 8,
-              "end": 13,
+              "end": 12,
               "key": {
                 "commentStart": 8,
                 "end": 9,
@@ -33,10 +33,10 @@ expression: actual
               "start": 8,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 12,
+                "commentStart": 11,
-                "end": 13,
+                "end": 12,
                 "raw": "1",
-                "start": 12,
+                "start": 11,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -46,22 +46,22 @@ expression: actual
               }
             },
             {
-              "commentStart": 15,
+              "commentStart": 14,
-              "end": 20,
+              "end": 18,
               "key": {
-                "commentStart": 15,
+                "commentStart": 14,
-                "end": 16,
+                "end": 15,
                 "name": "b",
-                "start": 15,
+                "start": 14,
                 "type": "Identifier"
               },
-              "start": 15,
+              "start": 14,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 19,
+                "commentStart": 17,
-                "end": 20,
+                "end": 18,
                 "raw": "2",
-                "start": 19,
+                "start": 17,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -78,32 +78,32 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 22,
+      "end": 20,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 28,
+      "commentStart": 26,
       "declaration": {
-        "commentStart": 28,
+        "commentStart": 26,
-        "end": 49,
+        "end": 47,
         "id": {
-          "commentStart": 28,
+          "commentStart": 26,
-          "end": 34,
+          "end": 32,
           "name": "height",
-          "start": 28,
+          "start": 26,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 37,
+          "commentStart": 35,
-          "end": 49,
+          "end": 47,
           "left": {
-            "commentStart": 37,
+            "commentStart": 35,
-            "end": 38,
+            "end": 36,
             "raw": "1",
-            "start": 37,
+            "start": 35,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -113,45 +113,45 @@ expression: actual
           },
           "operator": "-",
           "right": {
-            "commentStart": 41,
+            "commentStart": 39,
             "computed": false,
-            "end": 49,
+            "end": 47,
             "object": {
-              "commentStart": 41,
+              "commentStart": 39,
-              "end": 44,
+              "end": 42,
               "name": "obj",
-              "start": 41,
+              "start": 39,
               "type": "Identifier",
               "type": "Identifier"
             },
             "property": {
-              "commentStart": 45,
+              "commentStart": 43,
-              "end": 48,
+              "end": 46,
               "raw": "\"a\"",
-              "start": 45,
+              "start": 43,
               "type": "Literal",
               "type": "Literal",
               "value": "a"
             },
-            "start": 41,
+            "start": 39,
             "type": "MemberExpression",
             "type": "MemberExpression"
           },
-          "start": 37,
+          "start": 35,
           "type": "BinaryExpression",
           "type": "BinaryExpression"
         },
-        "start": 28,
+        "start": 26,
         "type": "VariableDeclarator"
       },
-      "end": 49,
+      "end": 47,
       "kind": "const",
-      "start": 28,
+      "start": 26,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     }
   ],
   "commentStart": 0,
-  "end": 49,
+  "end": 47,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__j.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 22,
+        "end": 20,
         "id": {
           "commentStart": 0,
           "end": 3,
@@ -18,11 +18,11 @@ expression: actual
         },
         "init": {
           "commentStart": 6,
-          "end": 22,
+          "end": 20,
           "properties": [
             {
               "commentStart": 8,
-              "end": 13,
+              "end": 12,
               "key": {
                 "commentStart": 8,
                 "end": 9,
@@ -33,10 +33,10 @@ expression: actual
               "start": 8,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 12,
+                "commentStart": 11,
-                "end": 13,
+                "end": 12,
                 "raw": "1",
-                "start": 12,
+                "start": 11,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -46,22 +46,22 @@ expression: actual
               }
             },
             {
-              "commentStart": 15,
+              "commentStart": 14,
-              "end": 20,
+              "end": 18,
               "key": {
-                "commentStart": 15,
+                "commentStart": 14,
-                "end": 16,
+                "end": 15,
                 "name": "b",
-                "start": 15,
+                "start": 14,
                 "type": "Identifier"
               },
-              "start": 15,
+              "start": 14,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 19,
+                "commentStart": 17,
-                "end": 20,
+                "end": 18,
                 "raw": "2",
-                "start": 19,
+                "start": 17,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -78,58 +78,58 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 22,
+      "end": 20,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 27,
+      "commentStart": 25,
       "declaration": {
-        "commentStart": 27,
+        "commentStart": 25,
-        "end": 48,
+        "end": 46,
         "id": {
-          "commentStart": 27,
+          "commentStart": 25,
-          "end": 33,
+          "end": 31,
           "name": "height",
-          "start": 27,
+          "start": 25,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 36,
+          "commentStart": 34,
-          "end": 48,
+          "end": 46,
           "left": {
-            "commentStart": 36,
+            "commentStart": 34,
             "computed": false,
-            "end": 44,
+            "end": 42,
             "object": {
-              "commentStart": 36,
+              "commentStart": 34,
-              "end": 39,
+              "end": 37,
               "name": "obj",
-              "start": 36,
+              "start": 34,
               "type": "Identifier",
               "type": "Identifier"
             },
             "property": {
-              "commentStart": 40,
+              "commentStart": 38,
-              "end": 43,
+              "end": 41,
               "raw": "\"a\"",
-              "start": 40,
+              "start": 38,
               "type": "Literal",
               "type": "Literal",
               "value": "a"
             },
-            "start": 36,
+            "start": 34,
             "type": "MemberExpression",
             "type": "MemberExpression"
           },
           "operator": "-",
           "right": {
-            "commentStart": 47,
+            "commentStart": 45,
-            "end": 48,
+            "end": 46,
             "raw": "1",
-            "start": 47,
+            "start": 45,
             "type": "Literal",
             "type": "Literal",
             "value": {
@@ -137,21 +137,21 @@ expression: actual
               "suffix": "None"
             }
           },
-          "start": 36,
+          "start": 34,
           "type": "BinaryExpression",
           "type": "BinaryExpression"
         },
-        "start": 27,
+        "start": 25,
         "type": "VariableDeclarator"
       },
-      "end": 48,
+      "end": 46,
       "kind": "const",
-      "start": 27,
+      "start": 25,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     }
   ],
   "commentStart": 0,
-  "end": 48,
+  "end": 46,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__k.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 22,
+        "end": 20,
         "id": {
           "commentStart": 0,
           "end": 3,
@@ -18,11 +18,11 @@ expression: actual
         },
         "init": {
           "commentStart": 6,
-          "end": 22,
+          "end": 20,
           "properties": [
             {
               "commentStart": 8,
-              "end": 13,
+              "end": 12,
               "key": {
                 "commentStart": 8,
                 "end": 9,
@@ -33,10 +33,10 @@ expression: actual
               "start": 8,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 12,
+                "commentStart": 11,
-                "end": 13,
+                "end": 12,
                 "raw": "1",
-                "start": 12,
+                "start": 11,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -46,22 +46,22 @@ expression: actual
               }
             },
             {
-              "commentStart": 15,
+              "commentStart": 14,
-              "end": 20,
+              "end": 18,
               "key": {
-                "commentStart": 15,
+                "commentStart": 14,
-                "end": 16,
+                "end": 15,
                 "name": "b",
-                "start": 15,
+                "start": 14,
                 "type": "Identifier"
               },
-              "start": 15,
+              "start": 14,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 19,
+                "commentStart": 17,
-                "end": 20,
+                "end": 18,
                 "raw": "2",
-                "start": 19,
+                "start": 17,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -78,35 +78,35 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 22,
+      "end": 20,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 27,
+      "commentStart": 25,
       "declaration": {
-        "commentStart": 27,
+        "commentStart": 25,
-        "end": 53,
+        "end": 51,
         "id": {
-          "commentStart": 27,
+          "commentStart": 25,
-          "end": 33,
+          "end": 31,
           "name": "height",
-          "start": 27,
+          "start": 25,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 36,
+          "commentStart": 34,
           "elements": [
             {
-              "commentStart": 37,
+              "commentStart": 35,
-              "end": 49,
+              "end": 47,
               "left": {
-                "commentStart": 37,
+                "commentStart": 35,
-                "end": 38,
+                "end": 36,
                 "raw": "1",
-                "start": 37,
+                "start": 35,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -116,39 +116,39 @@ expression: actual
               },
               "operator": "-",
               "right": {
-                "commentStart": 41,
+                "commentStart": 39,
                 "computed": false,
-                "end": 49,
+                "end": 47,
                 "object": {
-                  "commentStart": 41,
+                  "commentStart": 39,
-                  "end": 44,
+                  "end": 42,
                   "name": "obj",
-                  "start": 41,
+                  "start": 39,
                   "type": "Identifier",
                   "type": "Identifier"
                 },
                 "property": {
-                  "commentStart": 45,
+                  "commentStart": 43,
-                  "end": 48,
+                  "end": 46,
                   "raw": "\"a\"",
-                  "start": 45,
+                  "start": 43,
                   "type": "Literal",
                   "type": "Literal",
                   "value": "a"
                 },
-                "start": 41,
+                "start": 39,
                 "type": "MemberExpression",
                 "type": "MemberExpression"
               },
-              "start": 37,
+              "start": 35,
               "type": "BinaryExpression",
               "type": "BinaryExpression"
             },
             {
-              "commentStart": 51,
+              "commentStart": 49,
-              "end": 52,
+              "end": 50,
               "raw": "0",
-              "start": 51,
+              "start": 49,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -157,22 +157,22 @@ expression: actual
               }
             }
           ],
-          "end": 53,
+          "end": 51,
-          "start": 36,
+          "start": 34,
           "type": "ArrayExpression",
           "type": "ArrayExpression"
         },
-        "start": 27,
+        "start": 25,
         "type": "VariableDeclarator"
       },
-      "end": 53,
+      "end": 51,
       "kind": "const",
-      "start": 27,
+      "start": 25,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     }
   ],
   "commentStart": 0,
-  "end": 53,
+  "end": 51,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_args_one.snap

@@ -0,0 +1,66 @@
+---
+source: kcl-lib/src/parsing/parser.rs
+expression: actual
+---
+{
+  "body": [
+    {
+      "commentStart": 0,
+      "declaration": {
+        "commentStart": 0,
+        "end": 10,
+        "id": {
+          "commentStart": 0,
+          "end": 3,
+          "name": "val",
+          "start": 0,
+          "type": "Identifier"
+        },
+        "init": {
+          "callee": {
+            "abs_path": false,
+            "commentStart": 6,
+            "end": 7,
+            "name": {
+              "commentStart": 6,
+              "end": 7,
+              "name": "f",
+              "start": 6,
+              "type": "Identifier"
+            },
+            "path": [],
+            "start": 6,
+            "type": "Name"
+          },
+          "commentStart": 6,
+          "end": 10,
+          "start": 6,
+          "type": "CallExpressionKw",
+          "type": "CallExpressionKw",
+          "unlabeled": {
+            "commentStart": 8,
+            "end": 9,
+            "raw": "3",
+            "start": 8,
+            "type": "Literal",
+            "type": "Literal",
+            "value": {
+              "value": 3.0,
+              "suffix": "None"
+            }
+          }
+        },
+        "start": 0,
+        "type": "VariableDeclarator"
+      },
+      "end": 10,
+      "kind": "const",
+      "start": 0,
+      "type": "VariableDeclaration",
+      "type": "VariableDeclaration"
+    }
+  ],
+  "commentStart": 0,
+  "end": 10,
+  "start": 0
+}

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__kw_function_args_zero.snap

@@ -0,0 +1,55 @@
+---
+source: kcl-lib/src/parsing/parser.rs
+expression: actual
+---
+{
+  "body": [
+    {
+      "commentStart": 0,
+      "declaration": {
+        "commentStart": 0,
+        "end": 9,
+        "id": {
+          "commentStart": 0,
+          "end": 3,
+          "name": "val",
+          "start": 0,
+          "type": "Identifier"
+        },
+        "init": {
+          "callee": {
+            "abs_path": false,
+            "commentStart": 6,
+            "end": 7,
+            "name": {
+              "commentStart": 6,
+              "end": 7,
+              "name": "f",
+              "start": 6,
+              "type": "Identifier"
+            },
+            "path": [],
+            "start": 6,
+            "type": "Name"
+          },
+          "commentStart": 6,
+          "end": 9,
+          "start": 6,
+          "type": "CallExpressionKw",
+          "type": "CallExpressionKw",
+          "unlabeled": null
+        },
+        "start": 0,
+        "type": "VariableDeclarator"
+      },
+      "end": 9,
+      "kind": "const",
+      "start": 0,
+      "type": "VariableDeclaration",
+      "type": "VariableDeclaration"
+    }
+  ],
+  "commentStart": 0,
+  "end": 9,
+  "start": 0
+}

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__l.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 22,
+        "end": 20,
         "id": {
           "commentStart": 0,
           "end": 3,
@@ -18,11 +18,11 @@ expression: actual
         },
         "init": {
           "commentStart": 6,
-          "end": 22,
+          "end": 20,
           "properties": [
             {
               "commentStart": 8,
-              "end": 13,
+              "end": 12,
               "key": {
                 "commentStart": 8,
                 "end": 9,
@@ -33,10 +33,10 @@ expression: actual
               "start": 8,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 12,
+                "commentStart": 11,
-                "end": 13,
+                "end": 12,
                 "raw": "1",
-                "start": 12,
+                "start": 11,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -46,22 +46,22 @@ expression: actual
               }
             },
             {
-              "commentStart": 15,
+              "commentStart": 14,
-              "end": 20,
+              "end": 18,
               "key": {
-                "commentStart": 15,
+                "commentStart": 14,
-                "end": 16,
+                "end": 15,
                 "name": "b",
-                "start": 15,
+                "start": 14,
                 "type": "Identifier"
               },
-              "start": 15,
+              "start": 14,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 19,
+                "commentStart": 17,
-                "end": 20,
+                "end": 18,
                 "raw": "2",
-                "start": 19,
+                "start": 17,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -78,61 +78,61 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 22,
+      "end": 20,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 27,
+      "commentStart": 25,
       "declaration": {
-        "commentStart": 27,
+        "commentStart": 25,
-        "end": 53,
+        "end": 51,
         "id": {
-          "commentStart": 27,
+          "commentStart": 25,
-          "end": 33,
+          "end": 31,
           "name": "height",
-          "start": 27,
+          "start": 25,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 36,
+          "commentStart": 34,
           "elements": [
             {
-              "commentStart": 37,
+              "commentStart": 35,
-              "end": 49,
+              "end": 47,
               "left": {
-                "commentStart": 37,
+                "commentStart": 35,
                 "computed": false,
-                "end": 45,
+                "end": 43,
                 "object": {
-                  "commentStart": 37,
+                  "commentStart": 35,
-                  "end": 40,
+                  "end": 38,
                   "name": "obj",
-                  "start": 37,
+                  "start": 35,
                   "type": "Identifier",
                   "type": "Identifier"
                 },
                 "property": {
-                  "commentStart": 41,
+                  "commentStart": 39,
-                  "end": 44,
+                  "end": 42,
                   "raw": "\"a\"",
-                  "start": 41,
+                  "start": 39,
                   "type": "Literal",
                   "type": "Literal",
                   "value": "a"
                 },
-                "start": 37,
+                "start": 35,
                 "type": "MemberExpression",
                 "type": "MemberExpression"
               },
               "operator": "-",
               "right": {
-                "commentStart": 48,
+                "commentStart": 46,
-                "end": 49,
+                "end": 47,
                 "raw": "1",
-                "start": 48,
+                "start": 46,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -140,15 +140,15 @@ expression: actual
                   "suffix": "None"
                 }
               },
-              "start": 37,
+              "start": 35,
               "type": "BinaryExpression",
               "type": "BinaryExpression"
             },
             {
-              "commentStart": 51,
+              "commentStart": 49,
-              "end": 52,
+              "end": 50,
               "raw": "0",
-              "start": 51,
+              "start": 49,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -157,22 +157,22 @@ expression: actual
               }
             }
           ],
-          "end": 53,
+          "end": 51,
-          "start": 36,
+          "start": 34,
           "type": "ArrayExpression",
           "type": "ArrayExpression"
         },
-        "start": 27,
+        "start": 25,
         "type": "VariableDeclarator"
       },
-      "end": 53,
+      "end": 51,
       "kind": "const",
-      "start": 27,
+      "start": 25,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     }
   ],
   "commentStart": 0,
-  "end": 53,
+  "end": 51,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__m.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 21,
+        "end": 20,
         "id": {
           "commentStart": 0,
           "end": 3,
@@ -18,19 +18,19 @@ expression: actual
         },
         "init": {
           "commentStart": 6,
-          "end": 21,
+          "end": 20,
           "properties": [
             {
-              "commentStart": 7,
+              "commentStart": 8,
               "end": 12,
               "key": {
-                "commentStart": 7,
+                "commentStart": 8,
-                "end": 8,
+                "end": 9,
                 "name": "a",
-                "start": 7,
+                "start": 8,
                 "type": "Identifier"
               },
-              "start": 7,
+              "start": 8,
               "type": "ObjectProperty",
               "value": {
                 "commentStart": 11,
@@ -47,7 +47,7 @@ expression: actual
             },
             {
               "commentStart": 14,
-              "end": 19,
+              "end": 18,
               "key": {
                 "commentStart": 14,
                 "end": 15,
@@ -58,10 +58,10 @@ expression: actual
               "start": 14,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 18,
+                "commentStart": 17,
-                "end": 19,
+                "end": 18,
                 "raw": "2",
-                "start": 18,
+                "start": 17,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -78,61 +78,61 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 21,
+      "end": 20,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 26,
+      "commentStart": 25,
       "declaration": {
-        "commentStart": 26,
+        "commentStart": 25,
-        "end": 51,
+        "end": 50,
         "id": {
-          "commentStart": 26,
+          "commentStart": 25,
-          "end": 32,
+          "end": 31,
           "name": "height",
-          "start": 26,
+          "start": 25,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 35,
+          "commentStart": 34,
           "elements": [
             {
-              "commentStart": 36,
+              "commentStart": 35,
-              "end": 47,
+              "end": 46,
               "left": {
-                "commentStart": 36,
+                "commentStart": 35,
                 "computed": false,
-                "end": 44,
+                "end": 43,
                 "object": {
-                  "commentStart": 36,
+                  "commentStart": 35,
-                  "end": 39,
+                  "end": 38,
                   "name": "obj",
-                  "start": 36,
+                  "start": 35,
                   "type": "Identifier",
                   "type": "Identifier"
                 },
                 "property": {
-                  "commentStart": 40,
+                  "commentStart": 39,
-                  "end": 43,
+                  "end": 42,
                   "raw": "\"a\"",
-                  "start": 40,
+                  "start": 39,
                   "type": "Literal",
                   "type": "Literal",
                   "value": "a"
                 },
-                "start": 36,
+                "start": 35,
                 "type": "MemberExpression",
                 "type": "MemberExpression"
               },
               "operator": "-",
               "right": {
-                "commentStart": 46,
+                "commentStart": 45,
-                "end": 47,
+                "end": 46,
                 "raw": "1",
-                "start": 46,
+                "start": 45,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -140,15 +140,15 @@ expression: actual
                   "suffix": "None"
                 }
               },
-              "start": 36,
+              "start": 35,
               "type": "BinaryExpression",
               "type": "BinaryExpression"
             },
             {
-              "commentStart": 49,
+              "commentStart": 48,
-              "end": 50,
+              "end": 49,
               "raw": "0",
-              "start": 49,
+              "start": 48,
               "type": "Literal",
               "type": "Literal",
               "value": {
@@ -157,22 +157,22 @@ expression: actual
               }
             }
           ],
-          "end": 51,
+          "end": 50,
-          "start": 35,
+          "start": 34,
           "type": "ArrayExpression",
           "type": "ArrayExpression"
         },
-        "start": 26,
+        "start": 25,
         "type": "VariableDeclarator"
       },
-      "end": 51,
+      "end": 50,
       "kind": "const",
-      "start": 26,
+      "start": 25,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     }
   ],
   "commentStart": 0,
-  "end": 51,
+  "end": 50,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__r.snap

@@ -8,7 +8,7 @@ expression: actual
       "commentStart": 0,
       "declaration": {
         "commentStart": 0,
-        "end": 22,
+        "end": 20,
         "id": {
           "commentStart": 0,
           "end": 3,
@@ -18,11 +18,11 @@ expression: actual
         },
         "init": {
           "commentStart": 6,
-          "end": 22,
+          "end": 20,
           "properties": [
             {
               "commentStart": 8,
-              "end": 13,
+              "end": 12,
               "key": {
                 "commentStart": 8,
                 "end": 9,
@@ -33,10 +33,10 @@ expression: actual
               "start": 8,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 12,
+                "commentStart": 11,
-                "end": 13,
+                "end": 12,
                 "raw": "1",
-                "start": 12,
+                "start": 11,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -46,22 +46,22 @@ expression: actual
               }
             },
             {
-              "commentStart": 15,
+              "commentStart": 14,
-              "end": 20,
+              "end": 18,
               "key": {
-                "commentStart": 15,
+                "commentStart": 14,
-                "end": 16,
+                "end": 15,
                 "name": "b",
-                "start": 15,
+                "start": 14,
                 "type": "Identifier"
               },
-              "start": 15,
+              "start": 14,
               "type": "ObjectProperty",
               "value": {
-                "commentStart": 19,
+                "commentStart": 17,
-                "end": 20,
+                "end": 18,
                 "raw": "2",
-                "start": 19,
+                "start": 17,
                 "type": "Literal",
                 "type": "Literal",
                 "value": {
@@ -78,60 +78,60 @@ expression: actual
         "start": 0,
         "type": "VariableDeclarator"
       },
-      "end": 22,
+      "end": 20,
       "kind": "const",
       "start": 0,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     },
     {
-      "commentStart": 27,
+      "commentStart": 25,
       "declaration": {
-        "commentStart": 27,
+        "commentStart": 25,
-        "end": 44,
+        "end": 42,
         "id": {
-          "commentStart": 27,
+          "commentStart": 25,
-          "end": 33,
+          "end": 31,
           "name": "height",
-          "start": 27,
+          "start": 25,
           "type": "Identifier"
         },
         "init": {
-          "commentStart": 36,
+          "commentStart": 34,
           "computed": false,
-          "end": 44,
+          "end": 42,
           "object": {
-            "commentStart": 36,
+            "commentStart": 34,
-            "end": 39,
+            "end": 37,
             "name": "obj",
-            "start": 36,
+            "start": 34,
             "type": "Identifier",
             "type": "Identifier"
           },
           "property": {
-            "commentStart": 40,
+            "commentStart": 38,
-            "end": 43,
+            "end": 41,
             "raw": "\"a\"",
-            "start": 40,
+            "start": 38,
             "type": "Literal",
             "type": "Literal",
             "value": "a"
           },
-          "start": 36,
+          "start": 34,
           "type": "MemberExpression",
           "type": "MemberExpression"
         },
-        "start": 27,
+        "start": 25,
         "type": "VariableDeclarator"
       },
-      "end": 44,
+      "end": 42,
       "kind": "const",
-      "start": 27,
+      "start": 25,
       "type": "VariableDeclaration",
       "type": "VariableDeclaration"
     }
   ],
   "commentStart": 0,
-  "end": 44,
+  "end": 42,
   "start": 0
 }

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__y.snap

@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 19,
-                  "end": 21,
-                  "name": {
-                    "commentStart": 19,
-                    "end": 21,
-                    "name": "XY",
-                    "start": 19,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 19,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 5,
@@ -55,43 +37,62 @@ expression: actual
               "commentStart": 5,
               "end": 22,
               "start": 5,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 19,
+                "end": 21,
+                "name": {
+                  "commentStart": 19,
+                  "end": 21,
+                  "name": "XY",
+                  "start": 19,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 19,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [
                 {
-                  "abs_path": false,
+                  "type": "LabeledArg",
-                  "commentStart": 41,
+                  "label": {
-                  "end": 44,
+                    "commentStart": 39,
-                  "name": {
+                    "end": 41,
-                    "commentStart": 41,
+                    "name": "at",
-                    "end": 44,
+                    "start": 39,
-                    "name": "pos",
-                    "start": 41,
                     "type": "Identifier"
                   },
-                  "path": [],
+                  "arg": {
-                  "start": 41,
+                    "abs_path": false,
-                  "type": "Name",
+                    "commentStart": 44,
-                  "type": "Name"
+                    "end": 47,
-                },
+                    "name": {
-                {
+                      "commentStart": 44,
-                  "commentStart": 46,
+                      "end": 47,
-                  "end": 47,
+                      "name": "pos",
-                  "start": 46,
+                      "start": 44,
-                  "type": "PipeSubstitution",
+                      "type": "Identifier"
-                  "type": "PipeSubstitution"
+                    },
+                    "path": [],
+                    "start": 44,
+                    "type": "Name",
+                    "type": "Name"
+                  }
                 }
               ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 26,
-                "end": 40,
+                "end": 38,
                 "name": {
                   "commentStart": 26,
-                  "end": 40,
+                  "end": 38,
-                  "name": "startProfileAt",
+                  "name": "startProfile",
                   "start": 26,
                   "type": "Identifier"
                 },
@@ -102,8 +103,9 @@ expression: actual
               "commentStart": 26,
               "end": 48,
               "start": 26,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             }
           ],
           "commentStart": 5,

rust/kcl-lib/src/parsing/snapshots/kcl_lib__parsing__parser__snapshot_tests__z.snap

@@ -19,24 +19,6 @@ expression: actual
         "init": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 19,
-                  "end": 21,
-                  "name": {
-                    "commentStart": 19,
-                    "end": 21,
-                    "name": "XY",
-                    "start": 19,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 19,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 5,
@@ -55,36 +37,62 @@ expression: actual
               "commentStart": 5,
               "end": 22,
               "start": 5,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 19,
+                "end": 21,
+                "name": {
+                  "commentStart": 19,
+                  "end": 21,
+                  "name": "XY",
+                  "start": 19,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 19,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [
                 {
-                  "abs_path": false,
+                  "type": "LabeledArg",
-                  "commentStart": 45,
+                  "label": {
-                  "end": 48,
+                    "commentStart": 43,
-                  "name": {
+                    "end": 45,
-                    "commentStart": 45,
+                    "name": "at",
-                    "end": 48,
+                    "start": 43,
-                    "name": "pos",
-                    "start": 45,
                     "type": "Identifier"
                   },
-                  "path": [],
+                  "arg": {
-                  "start": 45,
+                    "abs_path": false,
-                  "type": "Name",
+                    "commentStart": 48,
-                  "type": "Name"
+                    "end": 51,
+                    "name": {
+                      "commentStart": 48,
+                      "end": 51,
+                      "name": "pos",
+                      "start": 48,
+                      "type": "Identifier"
+                    },
+                    "path": [],
+                    "start": 48,
+                    "type": "Name",
+                    "type": "Name"
+                  }
                 }
               ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 30,
-                "end": 44,
+                "end": 42,
                 "name": {
                   "commentStart": 30,
-                  "end": 44,
+                  "end": 42,
-                  "name": "startProfileAt",
+                  "name": "startProfile",
                   "start": 30,
                   "type": "Identifier"
                 },
@@ -93,86 +101,78 @@ expression: actual
                 "type": "Name"
               },
               "commentStart": 30,
-              "end": 49,
+              "end": 52,
               "start": 30,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             },
             {
-              "arguments": [
-                {
-                  "commentStart": 58,
-                  "elements": [
-                    {
-                      "commentStart": 59,
-                      "end": 60,
-                      "raw": "0",
-                      "start": 59,
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 0.0,
-                        "suffix": "None"
-                      }
-                    },
-                    {
-                      "argument": {
-                        "abs_path": false,
-                        "commentStart": 63,
-                        "end": 68,
-                        "name": {
-                          "commentStart": 63,
-                          "end": 68,
-                          "name": "scale",
-                          "start": 63,
-                          "type": "Identifier"
-                        },
-                        "path": [],
-                        "start": 63,
-                        "type": "Name",
-                        "type": "Name"
-                      },
-                      "commentStart": 62,
-                      "end": 68,
-                      "operator": "-",
-                      "start": 62,
-                      "type": "UnaryExpression",
-                      "type": "UnaryExpression"
-                    }
-                  ],
-                  "end": 69,
-                  "start": 58,
-                  "type": "ArrayExpression",
-                  "type": "ArrayExpression"
-                },
-                {
-                  "commentStart": 71,
-                  "end": 72,
-                  "start": 71,
-                  "type": "PipeSubstitution",
-                  "type": "PipeSubstitution"
-                }
-              ],
               "callee": {
                 "abs_path": false,
-                "commentStart": 53,
+                "commentStart": 56,
-                "end": 57,
+                "end": 60,
                 "name": {
-                  "commentStart": 53,
+                  "commentStart": 56,
-                  "end": 57,
+                  "end": 60,
                   "name": "line",
-                  "start": 53,
+                  "start": 56,
                   "type": "Identifier"
                 },
                 "path": [],
-                "start": 53,
+                "start": 56,
                 "type": "Name"
               },
-              "commentStart": 53,
+              "commentStart": 56,
               "end": 73,
-              "start": 53,
+              "start": 56,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "commentStart": 61,
+                "elements": [
+                  {
+                    "commentStart": 62,
+                    "end": 63,
+                    "raw": "0",
+                    "start": 62,
+                    "type": "Literal",
+                    "type": "Literal",
+                    "value": {
+                      "value": 0.0,
+                      "suffix": "None"
+                    }
+                  },
+                  {
+                    "argument": {
+                      "abs_path": false,
+                      "commentStart": 66,
+                      "end": 71,
+                      "name": {
+                        "commentStart": 66,
+                        "end": 71,
+                        "name": "scale",
+                        "start": 66,
+                        "type": "Identifier"
+                      },
+                      "path": [],
+                      "start": 66,
+                      "type": "Name",
+                      "type": "Name"
+                    },
+                    "commentStart": 65,
+                    "end": 71,
+                    "operator": "-",
+                    "start": 65,
+                    "type": "UnaryExpression",
+                    "type": "UnaryExpression"
+                  }
+                ],
+                "end": 72,
+                "start": 61,
+                "type": "ArrayExpression",
+                "type": "ArrayExpression"
+              }
             }
           ],
           "commentStart": 5,

rust/kcl-lib/tests/angled_line/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing angled_line.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing angled_line.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -385,24 +376,6 @@ description: Result of parsing angled_line.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "seg01",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -421,8 +394,24 @@ description: Result of parsing angled_line.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "seg01",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -547,7 +536,6 @@ description: Result of parsing angled_line.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -566,8 +554,9 @@ description: Result of parsing angled_line.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [

rust/kcl-lib/tests/array_elem_pop/ast.snap

@@ -84,24 +84,6 @@ description: Result of parsing array_elem_pop.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "arr",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -120,8 +102,24 @@ description: Result of parsing array_elem_pop.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "abs_path": false,
+              "commentStart": 0,
+              "end": 0,
+              "name": {
+                "commentStart": 0,
+                "end": 0,
+                "name": "arr",
+                "start": 0,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 0,
+              "type": "Name",
+              "type": "Name"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -145,24 +143,6 @@ description: Result of parsing array_elem_pop.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "new_arr1",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -181,8 +161,24 @@ description: Result of parsing array_elem_pop.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "abs_path": false,
+              "commentStart": 0,
+              "end": 0,
+              "name": {
+                "commentStart": 0,
+                "end": 0,
+                "name": "new_arr1",
+                "start": 0,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 0,
+              "type": "Name",
+              "type": "Name"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -206,24 +202,6 @@ description: Result of parsing array_elem_pop.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "new_arr2",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -242,8 +220,24 @@ description: Result of parsing array_elem_pop.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "abs_path": false,
+              "commentStart": 0,
+              "end": 0,
+              "name": {
+                "commentStart": 0,
+                "end": 0,
+                "name": "new_arr2",
+                "start": 0,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 0,
+              "type": "Name",
+              "type": "Name"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/array_elem_pop_empty_fail/ast.snap

@@ -47,24 +47,6 @@ description: Result of parsing array_elem_pop_empty_fail.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "arr",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -83,8 +65,24 @@ description: Result of parsing array_elem_pop_empty_fail.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "abs_path": false,
+              "commentStart": 0,
+              "end": 0,
+              "name": {
+                "commentStart": 0,
+                "end": 0,
+                "name": "arr",
+                "start": 0,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 0,
+              "type": "Name",
+              "type": "Name"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/array_elem_pop_fail/ast.snap

@@ -84,24 +84,6 @@ description: Result of parsing array_elem_pop_fail.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "arr",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -120,8 +102,24 @@ description: Result of parsing array_elem_pop_fail.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "abs_path": false,
+              "commentStart": 0,
+              "end": 0,
+              "name": {
+                "commentStart": 0,
+                "end": 0,
+                "name": "arr",
+                "start": 0,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 0,
+              "type": "Name",
+              "type": "Name"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/artifact_graph_example_code1/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing artifact_graph_example_code1.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -406,15 +397,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -433,19 +415,17 @@ description: Result of parsing artifact_graph_example_code1.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -464,8 +444,15 @@ description: Result of parsing artifact_graph_example_code1.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -498,7 +485,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -517,8 +503,9 @@ description: Result of parsing artifact_graph_example_code1.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -1041,15 +1028,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1068,19 +1046,17 @@ description: Result of parsing artifact_graph_example_code1.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1099,8 +1075,15 @@ description: Result of parsing artifact_graph_example_code1.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1133,7 +1116,6 @@ description: Result of parsing artifact_graph_example_code1.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1152,8 +1134,9 @@ description: Result of parsing artifact_graph_example_code1.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/artifact_graph_example_code_no_3d/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "YZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'YZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "YZ"
+                }
               },
               {
                 "arguments": [
@@ -229,24 +220,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                       "commentStart": 0,
                       "end": 0,
                       "left": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA001",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -265,8 +238,24 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA001",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "operator": "-",
                       "right": {
@@ -361,24 +350,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "rectangleSegmentA001",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -397,8 +368,24 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "rectangleSegmentA001",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -412,24 +399,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                     },
                     "arg": {
                       "argument": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA001",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -448,8 +417,24 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA001",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "commentStart": 0,
                       "end": 0,
@@ -515,15 +500,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -542,19 +518,17 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -573,8 +547,15 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -607,7 +588,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -626,8 +606,9 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -660,32 +641,6 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "argument": {
-                      "abs_path": false,
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": {
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": "XZ",
-                        "start": 0,
-                        "type": "Identifier"
-                      },
-                      "path": [],
-                      "start": 0,
-                      "type": "Name",
-                      "type": "Name"
-                    },
-                    "commentStart": 0,
-                    "end": 0,
-                    "operator": "-",
-                    "start": 0,
-                    "type": "UnaryExpression",
-                    "type": "UnaryExpression"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -704,8 +659,17 @@ description: Result of parsing artifact_graph_example_code_no_3d.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'-XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "-XZ"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/artifact_graph_example_code_offset_planes/ast.snap

@@ -63,20 +63,13 @@ description: Result of parsing artifact_graph_example_code_offset_planes.kcl
             "type": "CallExpressionKw",
             "type": "CallExpressionKw",
             "unlabeled": {
-              "abs_path": false,
               "commentStart": 0,
               "end": 0,
-              "name": {
+              "raw": "\"XY\"",
-                "commentStart": 0,
-                "end": 0,
-                "name": "XY",
-                "start": 0,
-                "type": "Identifier"
-              },
-              "path": [],
               "start": 0,
-              "type": "Name",
+              "type": "Literal",
-              "type": "Name"
+              "type": "Literal",
+              "value": "XY"
             }
           },
           "start": 0,
@@ -154,20 +147,13 @@ description: Result of parsing artifact_graph_example_code_offset_planes.kcl
             "type": "CallExpressionKw",
             "type": "CallExpressionKw",
             "unlabeled": {
-              "abs_path": false,
               "commentStart": 0,
               "end": 0,
-              "name": {
+              "raw": "\"XZ\"",
-                "commentStart": 0,
-                "end": 0,
-                "name": "XZ",
-                "start": 0,
-                "type": "Identifier"
-              },
-              "path": [],
               "start": 0,
-              "type": "Name",
+              "type": "Literal",
-              "type": "Name"
+              "type": "Literal",
+              "value": "XZ"
             }
           },
           "start": 0,
@@ -237,20 +223,13 @@ description: Result of parsing artifact_graph_example_code_offset_planes.kcl
             "type": "CallExpressionKw",
             "type": "CallExpressionKw",
             "unlabeled": {
-              "abs_path": false,
               "commentStart": 0,
               "end": 0,
-              "name": {
+              "raw": "\"YZ\"",
-                "commentStart": 0,
-                "end": 0,
-                "name": "YZ",
-                "start": 0,
-                "type": "Identifier"
-              },
-              "path": [],
               "start": 0,
-              "type": "Name",
+              "type": "Literal",
-              "type": "Name"
+              "type": "Literal",
+              "value": "YZ"
             }
           },
           "start": 0,
@@ -277,24 +256,6 @@ description: Result of parsing artifact_graph_example_code_offset_planes.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "offsetPlane001",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -313,8 +274,24 @@ description: Result of parsing artifact_graph_example_code_offset_planes.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "offsetPlane001",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/artifact_graph_sketch_on_face_etc/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,24 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XZ",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -304,15 +302,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -331,19 +320,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -362,8 +349,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -396,7 +390,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -415,8 +408,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -832,15 +826,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -859,19 +844,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -890,8 +873,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -924,7 +914,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -943,8 +932,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -1363,15 +1353,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1390,19 +1371,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1421,8 +1400,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1455,7 +1441,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1474,8 +1459,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -1891,15 +1877,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1918,19 +1895,17 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1949,8 +1924,15 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1983,7 +1965,6 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2002,8 +1983,9 @@ description: Result of parsing artifact_graph_sketch_on_face_etc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/basic_fillet_cube_close_opposite/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -518,24 +509,6 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
                           "type": "Name"
                         },
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "thing3",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -554,8 +527,24 @@ description: Result of parsing basic_fillet_cube_close_opposite.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "thing3",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,

rust/kcl-lib/tests/basic_fillet_cube_end/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_end.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing basic_fillet_cube_end.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -376,15 +367,6 @@ description: Result of parsing basic_fillet_cube_end.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -403,8 +385,15 @@ description: Result of parsing basic_fillet_cube_end.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [
@@ -506,24 +495,6 @@ description: Result of parsing basic_fillet_cube_end.kcl
                           "type": "Name"
                         },
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "thing",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -542,8 +513,24 @@ description: Result of parsing basic_fillet_cube_end.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "thing",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,

rust/kcl-lib/tests/basic_fillet_cube_next_adjacent/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -520,24 +511,6 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "thing3",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -556,8 +529,24 @@ description: Result of parsing basic_fillet_cube_next_adjacent.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "thing3",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,

rust/kcl-lib/tests/basic_fillet_cube_previous_adjacent/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -520,24 +511,6 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "thing3",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -556,8 +529,24 @@ description: Result of parsing basic_fillet_cube_previous_adjacent.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "thing3",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,

rust/kcl-lib/tests/basic_fillet_cube_start/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing basic_fillet_cube_start.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing basic_fillet_cube_start.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -376,15 +367,6 @@ description: Result of parsing basic_fillet_cube_start.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -403,8 +385,15 @@ description: Result of parsing basic_fillet_cube_start.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/circle_three_point/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing circle_three_point.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing circle_three_point.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/circular_pattern3d_a_pattern/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XZ"
+                }
               },
               {
                 "arguments": [
@@ -340,15 +331,6 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -367,8 +349,15 @@ description: Result of parsing circular_pattern3d_a_pattern.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/computed_var/ast.snap

@@ -585,59 +585,6 @@ description: Result of parsing computed_var.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "commentStart": 0,
-                "end": 0,
-                "expr": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "left": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "raw": "2",
-                    "start": 0,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 2.0,
-                      "suffix": "None"
-                    }
-                  },
-                  "operator": "*",
-                  "right": {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "PI",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  },
-                  "start": 0,
-                  "type": "BinaryExpression",
-                  "type": "BinaryExpression"
-                },
-                "start": 0,
-                "ty": {
-                  "Rad": null,
-                  "commentStart": 0,
-                  "end": 0,
-                  "p_type": "Number",
-                  "start": 0,
-                  "type": "Primitive"
-                },
-                "type": "AscribedExpression",
-                "type": "AscribedExpression"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -649,23 +596,66 @@ description: Result of parsing computed_var.kcl
                 "start": 0,
                 "type": "Identifier"
               },
-              "path": [
+              "path": [],
-                {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "math",
-                  "start": 0,
-                  "type": "Identifier"
-                }
-              ],
               "start": 0,
               "type": "Name"
             },
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "expr": {
+                "commentStart": 0,
+                "end": 0,
+                "left": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "2",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 2.0,
+                    "suffix": "None"
+                  }
+                },
+                "operator": "*",
+                "right": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "PI",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "start": 0,
+                "type": "BinaryExpression",
+                "type": "BinaryExpression"
+              },
+              "start": 0,
+              "ty": {
+                "Rad": null,
+                "commentStart": 0,
+                "end": 0,
+                "p_type": "Number",
+                "start": 0,
+                "type": "Primitive"
+              },
+              "type": "AscribedExpression",
+              "type": "AscribedExpression"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/cube/ast.snap

@@ -651,24 +651,6 @@ description: Result of parsing cube.kcl
                   "argument": {
                     "body": [
                       {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "XY",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -687,8 +669,24 @@ description: Result of parsing cube.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "XY",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       {
                         "arguments": [
@@ -946,7 +944,6 @@ description: Result of parsing cube.kcl
                         "unlabeled": null
                       },
                       {
-                        "arguments": [],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -965,8 +962,9 @@ description: Result of parsing cube.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": null
                       },
                       {
                         "arguments": [

rust/kcl-lib/tests/flush_batch_on_end/ast.snap

@@ -183,24 +183,6 @@ description: Result of parsing flush_batch_on_end.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "XY",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -219,8 +201,17 @@ description: Result of parsing flush_batch_on_end.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "raw": "'XY'",
+              "start": 0,
+              "type": "Literal",
+              "type": "Literal",
+              "value": "XY"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -230,7 +221,7 @@ description: Result of parsing flush_batch_on_end.kcl
         "preComments": [
           "",
           "",
-          "// create a sketch on the XY plane"
+          "// create a sketch on the 'XY' plane"
         ],
         "start": 0,
         "type": "VariableDeclaration",

rust/kcl-lib/tests/helix_ccw/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing helix_ccw.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing helix_ccw.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/helix_simple/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing helix_simple.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing helix_simple.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XZ"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/i_shape/ast.snap

@@ -354,24 +354,6 @@ description: Result of parsing i_shape.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -390,8 +372,24 @@ description: Result of parsing i_shape.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XY",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -2779,15 +2777,6 @@ description: Result of parsing i_shape.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2806,8 +2795,15 @@ description: Result of parsing i_shape.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               }
             ],
             "commentStart": 0,
@@ -2847,24 +2843,6 @@ description: Result of parsing i_shape.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2883,8 +2861,24 @@ description: Result of parsing i_shape.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XY",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -3583,15 +3577,6 @@ description: Result of parsing i_shape.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -3610,8 +3595,15 @@ description: Result of parsing i_shape.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/import_cycle1/ast.snap

@@ -55,7 +55,6 @@ description: Result of parsing import_cycle1.kcl
                     "commentStart": 0,
                     "end": 0,
                     "left": {
-                      "arguments": [],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -74,8 +73,9 @@ description: Result of parsing import_cycle1.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": null
                     },
                     "operator": "-",
                     "right": {

rust/kcl-lib/tests/import_function_not_sketch/ast.snap

@@ -55,7 +55,6 @@ description: Result of parsing import_function_not_sketch.kcl
                     "commentStart": 0,
                     "end": 0,
                     "left": {
-                      "arguments": [],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -74,8 +73,9 @@ description: Result of parsing import_function_not_sketch.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": null
                     },
                     "operator": "-",
                     "right": {

rust/kcl-lib/tests/import_mesh_clone/ast.snap

@@ -78,24 +78,6 @@ description: Result of parsing import_mesh_clone.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "model",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -114,8 +96,24 @@ description: Result of parsing import_mesh_clone.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "model",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/kittycad_svg/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing kittycad_svg.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing kittycad_svg.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -21484,15 +21475,6 @@ description: Result of parsing kittycad_svg.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -21511,8 +21493,15 @@ description: Result of parsing kittycad_svg.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/kw_fn/ast.snap

@@ -214,20 +214,6 @@ description: Result of parsing kw_fn.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "commentStart": 0,
-                "end": 0,
-                "raw": "1",
-                "start": 0,
-                "type": "Literal",
-                "type": "Literal",
-                "value": {
-                  "value": 1.0,
-                  "suffix": "None"
-                }
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -246,8 +232,20 @@ description: Result of parsing kw_fn.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "raw": "1",
+              "start": 0,
+              "type": "Literal",
+              "type": "Literal",
+              "value": {
+                "value": 1.0,
+                "suffix": "None"
+              }
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/kw_fn_with_defaults/ast.snap

@@ -135,20 +135,6 @@ description: Result of parsing kw_fn_with_defaults.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "commentStart": 0,
-                "end": 0,
-                "raw": "1",
-                "start": 0,
-                "type": "Literal",
-                "type": "Literal",
-                "value": {
-                  "value": 1.0,
-                  "suffix": "None"
-                }
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -167,8 +153,20 @@ description: Result of parsing kw_fn_with_defaults.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "raw": "1",
+              "start": 0,
+              "type": "Literal",
+              "type": "Literal",
+              "value": {
+                "value": 1.0,
+                "suffix": "None"
+              }
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/linear_pattern3d_a_pattern/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing linear_pattern3d_a_pattern.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing linear_pattern3d_a_pattern.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XZ"
+                }
               },
               {
                 "arguments": [
@@ -340,15 +331,6 @@ description: Result of parsing linear_pattern3d_a_pattern.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -367,8 +349,15 @@ description: Result of parsing linear_pattern3d_a_pattern.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/loop_tag/ast.snap

@@ -122,38 +122,53 @@ description: Result of parsing loop_tag.kcl
           "init": {
             "commentStart": 0,
             "end": 0,
-            "left": {
+            "expr": {
               "commentStart": 0,
               "end": 0,
-              "raw": "360",
+              "left": {
-              "start": 0,
-              "type": "Literal",
-              "type": "Literal",
-              "value": {
-                "value": 360.0,
-                "suffix": "None"
-              }
-            },
-            "operator": "/",
-            "right": {
-              "abs_path": false,
-              "commentStart": 0,
-              "end": 0,
-              "name": {
                 "commentStart": 0,
                 "end": 0,
-                "name": "numSides",
+                "raw": "360",
                 "start": 0,
-                "type": "Identifier"
+                "type": "Literal",
+                "type": "Literal",
+                "value": {
+                  "value": 360.0,
+                  "suffix": "None"
+                }
+              },
+              "operator": "/",
+              "right": {
+                "abs_path": false,
+                "commentStart": 0,
+                "end": 0,
+                "name": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": "numSides",
+                  "start": 0,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 0,
+                "type": "Name",
+                "type": "Name"
               },
-              "path": [],
               "start": 0,
-              "type": "Name",
+              "type": "BinaryExpression",
-              "type": "Name"
+              "type": "BinaryExpression"
             },
             "start": 0,
-            "type": "BinaryExpression",
+            "ty": {
-            "type": "BinaryExpression"
+              "Deg": null,
+              "commentStart": 0,
+              "end": 0,
+              "p_type": "Number",
+              "start": 0,
+              "type": "Primitive"
+            },
+            "type": "AscribedExpression",
+            "type": "AscribedExpression"
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -273,24 +288,6 @@ description: Result of parsing loop_tag.kcl
                       },
                       "operator": "*",
                       "right": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "angle",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -302,23 +299,31 @@ description: Result of parsing loop_tag.kcl
                             "start": 0,
                             "type": "Identifier"
                           },
-                          "path": [
+                          "path": [],
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "math",
-                              "start": 0,
-                              "type": "Identifier"
-                            }
-                          ],
                           "start": 0,
                           "type": "Name"
                         },
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "angle",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "start": 0,
                       "type": "BinaryExpression",
@@ -366,24 +371,6 @@ description: Result of parsing loop_tag.kcl
                       },
                       "operator": "*",
                       "right": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "angle",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -395,23 +382,31 @@ description: Result of parsing loop_tag.kcl
                             "start": 0,
                             "type": "Identifier"
                           },
-                          "path": [
+                          "path": [],
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "math",
-                              "start": 0,
-                              "type": "Identifier"
-                            }
-                          ],
                           "start": 0,
                           "type": "Name"
                         },
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "angle",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "start": 0,
                       "type": "BinaryExpression",
@@ -526,24 +521,6 @@ description: Result of parsing loop_tag.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -562,8 +539,24 @@ description: Result of parsing loop_tag.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XY",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -577,20 +570,6 @@ description: Result of parsing loop_tag.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "commentStart": 0,
-                          "end": 0,
-                          "raw": "0",
-                          "start": 0,
-                          "type": "Literal",
-                          "type": "Literal",
-                          "value": {
-                            "value": 0.0,
-                            "suffix": "None"
-                          }
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -609,8 +588,20 @@ description: Result of parsing loop_tag.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "commentStart": 0,
+                        "end": 0,
+                        "raw": "0",
+                        "start": 0,
+                        "type": "Literal",
+                        "type": "Literal",
+                        "value": {
+                          "value": 0.0,
+                          "suffix": "None"
+                        }
+                      }
                     }
                   }
                 ],
@@ -740,24 +731,6 @@ description: Result of parsing loop_tag.kcl
                                 "type": "Identifier"
                               },
                               "arg": {
-                                "arguments": [
-                                  {
-                                    "abs_path": false,
-                                    "commentStart": 0,
-                                    "end": 0,
-                                    "name": {
-                                      "commentStart": 0,
-                                      "end": 0,
-                                      "name": "index",
-                                      "start": 0,
-                                      "type": "Identifier"
-                                    },
-                                    "path": [],
-                                    "start": 0,
-                                    "type": "Name",
-                                    "type": "Name"
-                                  }
-                                ],
                                 "callee": {
                                   "abs_path": false,
                                   "commentStart": 0,
@@ -776,8 +749,24 @@ description: Result of parsing loop_tag.kcl
                                 "commentStart": 0,
                                 "end": 0,
                                 "start": 0,
-                                "type": "CallExpression",
+                                "type": "CallExpressionKw",
-                                "type": "CallExpression"
+                                "type": "CallExpressionKw",
+                                "unlabeled": {
+                                  "abs_path": false,
+                                  "commentStart": 0,
+                                  "end": 0,
+                                  "name": {
+                                    "commentStart": 0,
+                                    "end": 0,
+                                    "name": "index",
+                                    "start": 0,
+                                    "type": "Identifier"
+                                  },
+                                  "path": [],
+                                  "start": 0,
+                                  "type": "Name",
+                                  "type": "Name"
+                                }
                               }
                             },
                             {
@@ -976,24 +965,6 @@ description: Result of parsing loop_tag.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "finalSketch",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -1012,8 +983,24 @@ description: Result of parsing loop_tag.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "abs_path": false,
+              "commentStart": 0,
+              "end": 0,
+              "name": {
+                "commentStart": 0,
+                "end": 0,
+                "name": "finalSketch",
+                "start": 0,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 0,
+              "type": "Name",
+              "type": "Name"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/mike_stress_test/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing mike_stress_test.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing mike_stress_test.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -75808,15 +75799,6 @@ description: Result of parsing mike_stress_test.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -75835,8 +75817,15 @@ description: Result of parsing mike_stress_test.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/multi_transform/ast.snap

@@ -245,24 +245,6 @@ description: Result of parsing multi_transform.kcl
         "expression": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": "XY",
-                    "start": 0,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 0,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 0,
@@ -281,8 +263,24 @@ description: Result of parsing multi_transform.kcl
               "commentStart": 0,
               "end": 0,
               "start": 0,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "abs_path": false,
+                "commentStart": 0,
+                "end": 0,
+                "name": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": "XY",
+                  "start": 0,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 0,
+                "type": "Name",
+                "type": "Name"
+              }
             },
             {
               "arguments": [

rust/kcl-lib/tests/neg_xz_plane/ast.snap

@@ -20,32 +20,6 @@ description: Result of parsing neg_xz_plane.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "argument": {
-                      "abs_path": false,
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": {
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": "XZ",
-                        "start": 0,
-                        "type": "Identifier"
-                      },
-                      "path": [],
-                      "start": 0,
-                      "type": "Name",
-                      "type": "Name"
-                    },
-                    "commentStart": 0,
-                    "end": 0,
-                    "operator": "-",
-                    "start": 0,
-                    "type": "UnaryExpression",
-                    "type": "UnaryExpression"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -64,8 +38,17 @@ description: Result of parsing neg_xz_plane.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'-XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "-XZ"
+                }
               },
               {
                 "arguments": [
@@ -272,15 +255,6 @@ description: Result of parsing neg_xz_plane.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -299,8 +273,15 @@ description: Result of parsing neg_xz_plane.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/out_of_band_sketches/ast.snap

@@ -18,24 +18,6 @@ description: Result of parsing out_of_band_sketches.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "XZ",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -54,8 +36,17 @@ description: Result of parsing out_of_band_sketches.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "raw": "'XZ'",
+              "start": 0,
+              "type": "Literal",
+              "type": "Literal",
+              "value": "XZ"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -380,24 +371,6 @@ description: Result of parsing out_of_band_sketches.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "XY",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -416,8 +389,17 @@ description: Result of parsing out_of_band_sketches.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "raw": "'XY'",
+              "start": 0,
+              "type": "Literal",
+              "type": "Literal",
+              "value": "XY"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -852,7 +834,6 @@ description: Result of parsing out_of_band_sketches.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -871,8 +852,9 @@ description: Result of parsing out_of_band_sketches.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -1028,7 +1010,6 @@ description: Result of parsing out_of_band_sketches.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1047,8 +1028,9 @@ description: Result of parsing out_of_band_sketches.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/parametric/ast.snap

@@ -249,140 +249,6 @@ description: Result of parsing parametric.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "commentStart": 0,
-                "end": 0,
-                "left": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "left": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "left": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "left": {
-                        "commentStart": 0,
-                        "end": 0,
-                        "left": {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "distance",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        },
-                        "operator": "*",
-                        "right": {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "p",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        },
-                        "start": 0,
-                        "type": "BinaryExpression",
-                        "type": "BinaryExpression"
-                      },
-                      "operator": "*",
-                      "right": {
-                        "abs_path": false,
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "FOS",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "path": [],
-                        "start": 0,
-                        "type": "Name",
-                        "type": "Name"
-                      },
-                      "start": 0,
-                      "type": "BinaryExpression",
-                      "type": "BinaryExpression"
-                    },
-                    "operator": "*",
-                    "right": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "raw": "6",
-                      "start": 0,
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 6.0,
-                        "suffix": "None"
-                      }
-                    },
-                    "start": 0,
-                    "type": "BinaryExpression",
-                    "type": "BinaryExpression"
-                  },
-                  "operator": "/",
-                  "right": {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "sigmaAllow",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  },
-                  "start": 0,
-                  "type": "BinaryExpression",
-                  "type": "BinaryExpression"
-                },
-                "operator": "/",
-                "right": {
-                  "abs_path": false,
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": "width",
-                    "start": 0,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 0,
-                  "type": "Name",
-                  "type": "Name"
-                },
-                "start": 0,
-                "type": "BinaryExpression",
-                "type": "BinaryExpression"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -401,8 +267,140 @@ description: Result of parsing parametric.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "left": {
+                "commentStart": 0,
+                "end": 0,
+                "left": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "left": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "left": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "left": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "distance",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      },
+                      "operator": "*",
+                      "right": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "p",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      },
+                      "start": 0,
+                      "type": "BinaryExpression",
+                      "type": "BinaryExpression"
+                    },
+                    "operator": "*",
+                    "right": {
+                      "abs_path": false,
+                      "commentStart": 0,
+                      "end": 0,
+                      "name": {
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": "FOS",
+                        "start": 0,
+                        "type": "Identifier"
+                      },
+                      "path": [],
+                      "start": 0,
+                      "type": "Name",
+                      "type": "Name"
+                    },
+                    "start": 0,
+                    "type": "BinaryExpression",
+                    "type": "BinaryExpression"
+                  },
+                  "operator": "*",
+                  "right": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "raw": "6",
+                    "start": 0,
+                    "type": "Literal",
+                    "type": "Literal",
+                    "value": {
+                      "value": 6.0,
+                      "suffix": "None"
+                    }
+                  },
+                  "start": 0,
+                  "type": "BinaryExpression",
+                  "type": "BinaryExpression"
+                },
+                "operator": "/",
+                "right": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "sigmaAllow",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "start": 0,
+                "type": "BinaryExpression",
+                "type": "BinaryExpression"
+              },
+              "operator": "/",
+              "right": {
+                "abs_path": false,
+                "commentStart": 0,
+                "end": 0,
+                "name": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": "width",
+                  "start": 0,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 0,
+                "type": "Name",
+                "type": "Name"
+              },
+              "start": 0,
+              "type": "BinaryExpression",
+              "type": "BinaryExpression"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -428,24 +426,6 @@ description: Result of parsing parametric.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -464,8 +444,17 @@ description: Result of parsing parametric.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -968,15 +957,6 @@ description: Result of parsing parametric.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -995,8 +975,15 @@ description: Result of parsing parametric.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/parametric_with_tan_arc/ast.snap

@@ -183,140 +183,6 @@ description: Result of parsing parametric_with_tan_arc.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "commentStart": 0,
-                "end": 0,
-                "left": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "left": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "left": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "left": {
-                        "abs_path": false,
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "distance",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "path": [],
-                        "start": 0,
-                        "type": "Name",
-                        "type": "Name"
-                      },
-                      "operator": "*",
-                      "right": {
-                        "abs_path": false,
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": {
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": "p",
-                          "start": 0,
-                          "type": "Identifier"
-                        },
-                        "path": [],
-                        "start": 0,
-                        "type": "Name",
-                        "type": "Name"
-                      },
-                      "start": 0,
-                      "type": "BinaryExpression",
-                      "type": "BinaryExpression"
-                    },
-                    "operator": "*",
-                    "right": {
-                      "abs_path": false,
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": {
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": "FOS",
-                        "start": 0,
-                        "type": "Identifier"
-                      },
-                      "path": [],
-                      "start": 0,
-                      "type": "Name",
-                      "type": "Name"
-                    },
-                    "start": 0,
-                    "type": "BinaryExpression",
-                    "type": "BinaryExpression"
-                  },
-                  "operator": "*",
-                  "right": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "raw": "6",
-                    "start": 0,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 6.0,
-                      "suffix": "None"
-                    }
-                  },
-                  "start": 0,
-                  "type": "BinaryExpression",
-                  "type": "BinaryExpression"
-                },
-                "operator": "/",
-                "right": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "left": {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "sigmaAllow",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  },
-                  "operator": "*",
-                  "right": {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "width",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  },
-                  "start": 0,
-                  "type": "BinaryExpression",
-                  "type": "BinaryExpression"
-                },
-                "start": 0,
-                "type": "BinaryExpression",
-                "type": "BinaryExpression"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -335,8 +201,140 @@ description: Result of parsing parametric_with_tan_arc.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "left": {
+                "commentStart": 0,
+                "end": 0,
+                "left": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "left": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "left": {
+                      "abs_path": false,
+                      "commentStart": 0,
+                      "end": 0,
+                      "name": {
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": "distance",
+                        "start": 0,
+                        "type": "Identifier"
+                      },
+                      "path": [],
+                      "start": 0,
+                      "type": "Name",
+                      "type": "Name"
+                    },
+                    "operator": "*",
+                    "right": {
+                      "abs_path": false,
+                      "commentStart": 0,
+                      "end": 0,
+                      "name": {
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": "p",
+                        "start": 0,
+                        "type": "Identifier"
+                      },
+                      "path": [],
+                      "start": 0,
+                      "type": "Name",
+                      "type": "Name"
+                    },
+                    "start": 0,
+                    "type": "BinaryExpression",
+                    "type": "BinaryExpression"
+                  },
+                  "operator": "*",
+                  "right": {
+                    "abs_path": false,
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "name": "FOS",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "path": [],
+                    "start": 0,
+                    "type": "Name",
+                    "type": "Name"
+                  },
+                  "start": 0,
+                  "type": "BinaryExpression",
+                  "type": "BinaryExpression"
+                },
+                "operator": "*",
+                "right": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "6",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 6.0,
+                    "suffix": "None"
+                  }
+                },
+                "start": 0,
+                "type": "BinaryExpression",
+                "type": "BinaryExpression"
+              },
+              "operator": "/",
+              "right": {
+                "commentStart": 0,
+                "end": 0,
+                "left": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "sigmaAllow",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "operator": "*",
+                "right": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "width",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "start": 0,
+                "type": "BinaryExpression",
+                "type": "BinaryExpression"
+              },
+              "start": 0,
+              "type": "BinaryExpression",
+              "type": "BinaryExpression"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -485,24 +483,6 @@ description: Result of parsing parametric_with_tan_arc.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -521,8 +501,24 @@ description: Result of parsing parametric_with_tan_arc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XY",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -1155,15 +1151,6 @@ description: Result of parsing parametric_with_tan_arc.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1182,8 +1169,15 @@ description: Result of parsing parametric_with_tan_arc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/pattern_circular_in_module/ast.snap

@@ -39,7 +39,6 @@ description: Result of parsing pattern_circular_in_module.kcl
         "commentStart": 0,
         "end": 0,
         "expression": {
-          "arguments": [],
           "callee": {
             "abs_path": false,
             "commentStart": 0,
@@ -58,8 +57,9 @@ description: Result of parsing pattern_circular_in_module.kcl
           "commentStart": 0,
           "end": 0,
           "start": 0,
-          "type": "CallExpression",
+          "type": "CallExpressionKw",
-          "type": "CallExpression"
+          "type": "CallExpressionKw",
+          "unlabeled": null
         },
         "start": 0,
         "type": "ExpressionStatement",

rust/kcl-lib/tests/pattern_into_union/ast.snap

@@ -628,24 +628,6 @@ description: Result of parsing pattern_into_union.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -664,8 +646,24 @@ description: Result of parsing pattern_into_union.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XZ",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -1181,7 +1179,6 @@ description: Result of parsing pattern_into_union.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1200,8 +1197,9 @@ description: Result of parsing pattern_into_union.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -1293,24 +1291,6 @@ description: Result of parsing pattern_into_union.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1329,8 +1309,24 @@ description: Result of parsing pattern_into_union.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XZ",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -1650,7 +1646,6 @@ description: Result of parsing pattern_into_union.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1669,8 +1664,9 @@ description: Result of parsing pattern_into_union.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -1788,24 +1784,6 @@ description: Result of parsing pattern_into_union.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "toFillet",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1824,8 +1802,24 @@ description: Result of parsing pattern_into_union.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "toFillet",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,
@@ -2088,24 +2082,6 @@ description: Result of parsing pattern_into_union.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2124,8 +2100,24 @@ description: Result of parsing pattern_into_union.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XZ",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -2493,7 +2485,6 @@ description: Result of parsing pattern_into_union.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2512,8 +2503,9 @@ description: Result of parsing pattern_into_union.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               },
               {
                 "arguments": [
@@ -2631,24 +2623,6 @@ description: Result of parsing pattern_into_union.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "toFillet2",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -2667,8 +2641,24 @@ description: Result of parsing pattern_into_union.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "toFillet2",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,
@@ -2920,49 +2910,6 @@ description: Result of parsing pattern_into_union.kcl
         "commentStart": 0,
         "end": 0,
         "expression": {
-          "arguments": [
-            {
-              "commentStart": 0,
-              "elements": [
-                {
-                  "abs_path": false,
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": "base",
-                    "start": 0,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 0,
-                  "type": "Name",
-                  "type": "Name"
-                },
-                {
-                  "abs_path": false,
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": "endTabs",
-                    "start": 0,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 0,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
-              "end": 0,
-              "start": 0,
-              "type": "ArrayExpression",
-              "type": "ArrayExpression"
-            }
-          ],
           "callee": {
             "abs_path": false,
             "commentStart": 0,
@@ -2981,8 +2928,49 @@ description: Result of parsing pattern_into_union.kcl
           "commentStart": 0,
           "end": 0,
           "start": 0,
-          "type": "CallExpression",
+          "type": "CallExpressionKw",
-          "type": "CallExpression"
+          "type": "CallExpressionKw",
+          "unlabeled": {
+            "commentStart": 0,
+            "elements": [
+              {
+                "abs_path": false,
+                "commentStart": 0,
+                "end": 0,
+                "name": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": "base",
+                  "start": 0,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 0,
+                "type": "Name",
+                "type": "Name"
+              },
+              {
+                "abs_path": false,
+                "commentStart": 0,
+                "end": 0,
+                "name": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": "endTabs",
+                  "start": 0,
+                  "type": "Identifier"
+                },
+                "path": [],
+                "start": 0,
+                "type": "Name",
+                "type": "Name"
+              }
+            ],
+            "end": 0,
+            "start": 0,
+            "type": "ArrayExpression",
+            "type": "ArrayExpression"
+          }
         },
         "start": 0,
         "type": "ExpressionStatement",

rust/kcl-lib/tests/pattern_linear_in_module/ast.snap

@@ -39,7 +39,6 @@ description: Result of parsing pattern_linear_in_module.kcl
         "commentStart": 0,
         "end": 0,
         "expression": {
-          "arguments": [],
           "callee": {
             "abs_path": false,
             "commentStart": 0,
@@ -58,8 +57,9 @@ description: Result of parsing pattern_linear_in_module.kcl
           "commentStart": 0,
           "end": 0,
           "start": 0,
-          "type": "CallExpression",
+          "type": "CallExpressionKw",
-          "type": "CallExpression"
+          "type": "CallExpressionKw",
+          "unlabeled": null
         },
         "start": 0,
         "type": "ExpressionStatement",

rust/kcl-lib/tests/pipe_substitution_inside_function_called_from_pipeline/ast.snap

@@ -91,15 +91,6 @@ description: Result of parsing pipe_substitution_inside_function_called_from_pip
                 "type": "PipeSubstitution"
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -118,8 +109,15 @@ description: Result of parsing pipe_substitution_inside_function_called_from_pip
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/poop_chute/ast.snap

@@ -350,32 +350,6 @@ description: Result of parsing poop_chute.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "argument": {
-                      "abs_path": false,
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": {
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": "YZ",
-                        "start": 0,
-                        "type": "Identifier"
-                      },
-                      "path": [],
-                      "start": 0,
-                      "type": "Name",
-                      "type": "Name"
-                    },
-                    "commentStart": 0,
-                    "end": 0,
-                    "operator": "-",
-                    "start": 0,
-                    "type": "UnaryExpression",
-                    "type": "UnaryExpression"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -394,8 +368,32 @@ description: Result of parsing poop_chute.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "argument": {
+                    "abs_path": false,
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "name": "YZ",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "path": [],
+                    "start": 0,
+                    "type": "Name",
+                    "type": "Name"
+                  },
+                  "commentStart": 0,
+                  "end": 0,
+                  "operator": "-",
+                  "start": 0,
+                  "type": "UnaryExpression",
+                  "type": "UnaryExpression"
+                }
               },
               {
                 "arguments": [
@@ -773,24 +771,6 @@ description: Result of parsing poop_chute.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "seg01",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -809,8 +789,24 @@ description: Result of parsing poop_chute.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "seg01",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   }
                 ],
@@ -1235,24 +1231,6 @@ description: Result of parsing poop_chute.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "seg01",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -1271,8 +1249,24 @@ description: Result of parsing poop_chute.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "seg01",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   }
                 ],
@@ -1388,15 +1382,6 @@ description: Result of parsing poop_chute.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1415,8 +1400,15 @@ description: Result of parsing poop_chute.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               }
             ],
             "commentStart": 0,
@@ -1667,32 +1659,6 @@ description: Result of parsing poop_chute.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "argument": {
-                      "abs_path": false,
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": {
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": "YZ",
-                        "start": 0,
-                        "type": "Identifier"
-                      },
-                      "path": [],
-                      "start": 0,
-                      "type": "Name",
-                      "type": "Name"
-                    },
-                    "commentStart": 0,
-                    "end": 0,
-                    "operator": "-",
-                    "start": 0,
-                    "type": "UnaryExpression",
-                    "type": "UnaryExpression"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1711,8 +1677,32 @@ description: Result of parsing poop_chute.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "argument": {
+                    "abs_path": false,
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "name": "YZ",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "path": [],
+                    "start": 0,
+                    "type": "Name",
+                    "type": "Name"
+                  },
+                  "commentStart": 0,
+                  "end": 0,
+                  "operator": "-",
+                  "start": 0,
+                  "type": "UnaryExpression",
+                  "type": "UnaryExpression"
+                }
               },
               {
                 "arguments": [
@@ -2090,24 +2080,6 @@ description: Result of parsing poop_chute.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "seg01",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -2126,8 +2098,24 @@ description: Result of parsing poop_chute.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "seg01",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   }
                 ],
@@ -2552,24 +2540,6 @@ description: Result of parsing poop_chute.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "seg02",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -2588,8 +2558,24 @@ description: Result of parsing poop_chute.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "seg02",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   }
                 ],
@@ -2705,15 +2691,6 @@ description: Result of parsing poop_chute.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2732,8 +2709,15 @@ description: Result of parsing poop_chute.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/revolve_about_edge/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing revolve_about_edge.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing revolve_about_edge.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [
@@ -239,24 +230,6 @@ description: Result of parsing revolve_about_edge.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -275,8 +248,17 @@ description: Result of parsing revolve_about_edge.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/riddle_small/ast.snap

@@ -270,24 +270,6 @@ description: Result of parsing riddle_small.kcl
               "commentStart": 0,
               "end": 0,
               "left": {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "xs",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -306,8 +288,24 @@ description: Result of parsing riddle_small.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "xs",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               "operator": "%",
               "right": {
@@ -371,24 +369,6 @@ description: Result of parsing riddle_small.kcl
               "commentStart": 0,
               "end": 0,
               "left": {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "ys",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -407,8 +387,24 @@ description: Result of parsing riddle_small.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "ys",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               "operator": "%",
               "right": {
@@ -455,24 +451,6 @@ description: Result of parsing riddle_small.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -491,8 +469,17 @@ description: Result of parsing riddle_small.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XZ"
+                }
               },
               {
                 "arguments": [
@@ -791,15 +778,6 @@ description: Result of parsing riddle_small.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -818,8 +796,15 @@ description: Result of parsing riddle_small.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/rotate_after_fillet/ast.snap

@@ -248,20 +248,6 @@ description: Result of parsing rotate_after_fillet.kcl
               },
               "operator": "*",
               "right": {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "raw": "30deg",
-                    "start": 0,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 30.0,
-                      "suffix": "Deg"
-                    }
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -273,23 +259,27 @@ description: Result of parsing rotate_after_fillet.kcl
                     "start": 0,
                     "type": "Identifier"
                   },
-                  "path": [
+                  "path": [],
-                    {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "math",
-                      "start": 0,
-                      "type": "Identifier"
-                    }
-                  ],
                   "start": 0,
                   "type": "Name"
                 },
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "30deg",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 30.0,
+                    "suffix": "Deg"
+                  }
+                }
               },
               "start": 0,
               "type": "BinaryExpression",
@@ -373,24 +363,6 @@ description: Result of parsing rotate_after_fillet.kcl
                     "init": {
                       "body": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "XZ",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -409,8 +381,24 @@ description: Result of parsing rotate_after_fillet.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "XZ",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         },
                         {
                           "arguments": [
@@ -656,24 +644,6 @@ description: Result of parsing rotate_after_fillet.kcl
                                     "type": "Name"
                                   },
                                   {
-                                    "arguments": [
-                                      {
-                                        "abs_path": false,
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "name": {
-                                          "commentStart": 0,
-                                          "end": 0,
-                                          "name": "topEdge",
-                                          "start": 0,
-                                          "type": "Identifier"
-                                        },
-                                        "path": [],
-                                        "start": 0,
-                                        "type": "Name",
-                                        "type": "Name"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -692,8 +662,24 @@ description: Result of parsing rotate_after_fillet.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "abs_path": false,
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "name": {
+                                        "commentStart": 0,
+                                        "end": 0,
+                                        "name": "topEdge",
+                                        "start": 0,
+                                        "type": "Identifier"
+                                      },
+                                      "path": [],
+                                      "start": 0,
+                                      "type": "Name",
+                                      "type": "Name"
+                                    }
                                   }
                                 ],
                                 "end": 0,
@@ -1317,7 +1303,6 @@ description: Result of parsing rotate_after_fillet.kcl
                           "unlabeled": null
                         },
                         {
-                          "arguments": [],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1336,8 +1321,9 @@ description: Result of parsing rotate_after_fillet.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -1727,24 +1713,6 @@ description: Result of parsing rotate_after_fillet.kcl
                                 "commentStart": 0,
                                 "elements": [
                                   {
-                                    "arguments": [
-                                      {
-                                        "abs_path": false,
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "name": {
-                                          "commentStart": 0,
-                                          "end": 0,
-                                          "name": "filletEdge",
-                                          "start": 0,
-                                          "type": "Identifier"
-                                        },
-                                        "path": [],
-                                        "start": 0,
-                                        "type": "Name",
-                                        "type": "Name"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -1763,8 +1731,24 @@ description: Result of parsing rotate_after_fillet.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "abs_path": false,
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "name": {
+                                        "commentStart": 0,
+                                        "end": 0,
+                                        "name": "filletEdge",
+                                        "start": 0,
+                                        "type": "Identifier"
+                                      },
+                                      "path": [],
+                                      "start": 0,
+                                      "type": "Name",
+                                      "type": "Name"
+                                    }
                                   }
                                 ],
                                 "end": 0,
@@ -1978,7 +1962,6 @@ description: Result of parsing rotate_after_fillet.kcl
         "expression": {
           "body": [
             {
-              "arguments": [],
               "callee": {
                 "abs_path": false,
                 "commentStart": 0,
@@ -1997,8 +1980,9 @@ description: Result of parsing rotate_after_fillet.kcl
               "commentStart": 0,
               "end": 0,
               "start": 0,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             },
             {
               "arguments": [

rust/kcl-lib/tests/scale_after_fillet/ast.snap

@@ -248,20 +248,6 @@ description: Result of parsing scale_after_fillet.kcl
               },
               "operator": "*",
               "right": {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "raw": "30deg",
-                    "start": 0,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 30.0,
-                      "suffix": "Deg"
-                    }
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -273,23 +259,27 @@ description: Result of parsing scale_after_fillet.kcl
                     "start": 0,
                     "type": "Identifier"
                   },
-                  "path": [
+                  "path": [],
-                    {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "math",
-                      "start": 0,
-                      "type": "Identifier"
-                    }
-                  ],
                   "start": 0,
                   "type": "Name"
                 },
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "30deg",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 30.0,
+                    "suffix": "Deg"
+                  }
+                }
               },
               "start": 0,
               "type": "BinaryExpression",
@@ -373,24 +363,6 @@ description: Result of parsing scale_after_fillet.kcl
                     "init": {
                       "body": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "XZ",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -409,8 +381,24 @@ description: Result of parsing scale_after_fillet.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "XZ",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         },
                         {
                           "arguments": [
@@ -656,24 +644,6 @@ description: Result of parsing scale_after_fillet.kcl
                                     "type": "Name"
                                   },
                                   {
-                                    "arguments": [
-                                      {
-                                        "abs_path": false,
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "name": {
-                                          "commentStart": 0,
-                                          "end": 0,
-                                          "name": "topEdge",
-                                          "start": 0,
-                                          "type": "Identifier"
-                                        },
-                                        "path": [],
-                                        "start": 0,
-                                        "type": "Name",
-                                        "type": "Name"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -692,8 +662,24 @@ description: Result of parsing scale_after_fillet.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "abs_path": false,
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "name": {
+                                        "commentStart": 0,
+                                        "end": 0,
+                                        "name": "topEdge",
+                                        "start": 0,
+                                        "type": "Identifier"
+                                      },
+                                      "path": [],
+                                      "start": 0,
+                                      "type": "Name",
+                                      "type": "Name"
+                                    }
                                   }
                                 ],
                                 "end": 0,
@@ -1317,7 +1303,6 @@ description: Result of parsing scale_after_fillet.kcl
                           "unlabeled": null
                         },
                         {
-                          "arguments": [],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1336,8 +1321,9 @@ description: Result of parsing scale_after_fillet.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -1727,24 +1713,6 @@ description: Result of parsing scale_after_fillet.kcl
                                 "commentStart": 0,
                                 "elements": [
                                   {
-                                    "arguments": [
-                                      {
-                                        "abs_path": false,
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "name": {
-                                          "commentStart": 0,
-                                          "end": 0,
-                                          "name": "filletEdge",
-                                          "start": 0,
-                                          "type": "Identifier"
-                                        },
-                                        "path": [],
-                                        "start": 0,
-                                        "type": "Name",
-                                        "type": "Name"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -1763,8 +1731,24 @@ description: Result of parsing scale_after_fillet.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "abs_path": false,
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "name": {
+                                        "commentStart": 0,
+                                        "end": 0,
+                                        "name": "filletEdge",
+                                        "start": 0,
+                                        "type": "Identifier"
+                                      },
+                                      "path": [],
+                                      "start": 0,
+                                      "type": "Name",
+                                      "type": "Name"
+                                    }
                                   }
                                 ],
                                 "end": 0,
@@ -1978,7 +1962,6 @@ description: Result of parsing scale_after_fillet.kcl
         "expression": {
           "body": [
             {
-              "arguments": [],
               "callee": {
                 "abs_path": false,
                 "commentStart": 0,
@@ -1997,8 +1980,9 @@ description: Result of parsing scale_after_fillet.kcl
               "commentStart": 0,
               "end": 0,
               "start": 0,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             },
             {
               "arguments": [

rust/kcl-lib/tests/sketch-on-chamfer-two-times-different-order/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XZ",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -229,24 +227,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "end": 0,
                       "left": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA001",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -265,8 +245,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA001",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "operator": "-",
                       "right": {
@@ -361,24 +357,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "rectangleSegmentA001",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -397,8 +375,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "rectangleSegmentA001",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -412,24 +406,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                     },
                     "arg": {
                       "argument": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA001",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -448,8 +424,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA001",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "commentStart": 0,
                       "end": 0,
@@ -497,15 +489,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -524,19 +507,17 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -555,8 +536,15 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -607,7 +595,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -626,8 +613,9 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -858,24 +846,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "seg01",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -894,8 +864,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "seg01",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1319,24 +1305,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "end": 0,
                       "left": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA003",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -1355,8 +1323,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA003",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "operator": "-",
                       "right": {
@@ -1451,24 +1435,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "rectangleSegmentA003",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -1487,8 +1453,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "rectangleSegmentA003",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -1502,24 +1484,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                     },
                     "arg": {
                       "argument": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA003",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -1538,8 +1502,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA003",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "commentStart": 0,
                       "end": 0,
@@ -1605,15 +1585,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1632,19 +1603,17 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1663,8 +1632,15 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1697,7 +1673,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1716,8 +1691,9 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,
@@ -1985,24 +1961,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "end": 0,
                       "left": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA002",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -2021,8 +1979,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA002",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "operator": "-",
                       "right": {
@@ -2117,24 +2091,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "rectangleSegmentA002",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -2153,8 +2109,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "rectangleSegmentA002",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -2168,24 +2140,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                     },
                     "arg": {
                       "argument": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA002",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -2204,8 +2158,24 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA002",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "commentStart": 0,
                       "end": 0,
@@ -2271,15 +2241,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -2298,19 +2259,17 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -2329,8 +2288,15 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -2363,7 +2329,6 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2382,8 +2347,9 @@ description: Result of parsing sketch-on-chamfer-two-times-different-order.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/sketch-on-chamfer-two-times/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XZ"
+                }
               },
               {
                 "arguments": [
@@ -229,24 +220,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "end": 0,
                       "left": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA001",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -265,8 +238,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA001",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "operator": "-",
                       "right": {
@@ -361,24 +350,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "rectangleSegmentA001",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -397,8 +368,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "rectangleSegmentA001",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -412,24 +399,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                     },
                     "arg": {
                       "argument": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA001",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -448,8 +417,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA001",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "commentStart": 0,
                       "end": 0,
@@ -497,15 +482,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -524,19 +500,17 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -555,8 +529,15 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -607,15 +588,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -634,8 +606,15 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               }
             ],
             "commentStart": 0,
@@ -966,24 +945,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "seg01",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1002,8 +963,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "seg01",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1327,24 +1304,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "end": 0,
                       "left": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA003",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -1363,8 +1322,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA003",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "operator": "-",
                       "right": {
@@ -1459,24 +1434,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "rectangleSegmentA003",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -1495,8 +1452,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "rectangleSegmentA003",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -1510,24 +1483,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                     },
                     "arg": {
                       "argument": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA003",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -1546,8 +1501,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA003",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "commentStart": 0,
                       "end": 0,
@@ -1613,15 +1584,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1640,19 +1602,17 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1671,8 +1631,15 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1705,15 +1672,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1732,8 +1690,15 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               }
             ],
             "commentStart": 0,
@@ -2001,24 +1966,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "end": 0,
                       "left": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA002",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -2037,8 +1984,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA002",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "operator": "-",
                       "right": {
@@ -2133,24 +2096,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "rectangleSegmentA002",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -2169,8 +2114,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "rectangleSegmentA002",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {
@@ -2184,24 +2145,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                     },
                     "arg": {
                       "argument": {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "rectangleSegmentA002",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -2220,8 +2163,24 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "rectangleSegmentA002",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       "commentStart": 0,
                       "end": 0,
@@ -2287,15 +2246,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -2314,19 +2264,17 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -2345,8 +2293,15 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -2379,15 +2334,6 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -2406,8 +2352,15 @@ description: Result of parsing sketch-on-chamfer-two-times.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/sketch_in_object/ast.snap

@@ -24,24 +24,6 @@ description: Result of parsing sketch_in_object.kcl
                   "argument": {
                     "body": [
                       {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "XY",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -60,8 +42,17 @@ description: Result of parsing sketch_in_object.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "raw": "'XY'",
+                          "start": 0,
+                          "type": "Literal",
+                          "type": "Literal",
+                          "value": "XY"
+                        }
                       },
                       {
                         "arguments": [
@@ -344,15 +335,6 @@ description: Result of parsing sketch_in_object.kcl
                         "unlabeled": null
                       },
                       {
-                        "arguments": [
-                          {
-                            "commentStart": 0,
-                            "end": 0,
-                            "start": 0,
-                            "type": "PipeSubstitution",
-                            "type": "PipeSubstitution"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -371,8 +353,15 @@ description: Result of parsing sketch_in_object.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "start": 0,
+                          "type": "PipeSubstitution",
+                          "type": "PipeSubstitution"
+                        }
                       }
                     ],
                     "commentStart": 0,
@@ -459,24 +448,6 @@ description: Result of parsing sketch_in_object.kcl
                               "value": {
                                 "body": [
                                   {
-                                    "arguments": [
-                                      {
-                                        "abs_path": false,
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "name": {
-                                          "commentStart": 0,
-                                          "end": 0,
-                                          "name": "XY",
-                                          "start": 0,
-                                          "type": "Identifier"
-                                        },
-                                        "path": [],
-                                        "start": 0,
-                                        "type": "Name",
-                                        "type": "Name"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -495,8 +466,17 @@ description: Result of parsing sketch_in_object.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "raw": "'XY'",
+                                      "start": 0,
+                                      "type": "Literal",
+                                      "type": "Literal",
+                                      "value": "XY"
+                                    }
                                   },
                                   {
                                     "arguments": [
@@ -779,15 +759,6 @@ description: Result of parsing sketch_in_object.kcl
                                     "unlabeled": null
                                   },
                                   {
-                                    "arguments": [
-                                      {
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "start": 0,
-                                        "type": "PipeSubstitution",
-                                        "type": "PipeSubstitution"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -806,8 +777,15 @@ description: Result of parsing sketch_in_object.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "start": 0,
+                                      "type": "PipeSubstitution",
+                                      "type": "PipeSubstitution"
+                                    }
                                   }
                                 ],
                                 "commentStart": 0,
@@ -868,7 +846,6 @@ description: Result of parsing sketch_in_object.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -887,8 +864,9 @@ description: Result of parsing sketch_in_object.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": null
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -999,7 +977,6 @@ description: Result of parsing sketch_in_object.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -1018,8 +995,9 @@ description: Result of parsing sketch_in_object.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": null
           },
           "start": 0,
           "type": "VariableDeclarator"

rust/kcl-lib/tests/sketch_on_face/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing sketch_on_face.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,24 @@ description: Result of parsing sketch_on_face.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XY",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -382,15 +380,6 @@ description: Result of parsing sketch_on_face.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -409,8 +398,15 @@ description: Result of parsing sketch_on_face.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [
@@ -836,15 +832,6 @@ description: Result of parsing sketch_on_face.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -863,8 +850,15 @@ description: Result of parsing sketch_on_face.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/sketch_on_face_after_fillets_referencing_face/ast.snap

@@ -340,116 +340,6 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "commentStart": 0,
-                "end": 0,
-                "left": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "left": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "left": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "raw": "6",
-                      "start": 0,
-                      "type": "Literal",
-                      "type": "Literal",
-                      "value": {
-                        "value": 6.0,
-                        "suffix": "None"
-                      }
-                    },
-                    "operator": "*",
-                    "right": {
-                      "abs_path": false,
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": {
-                        "commentStart": 0,
-                        "end": 0,
-                        "name": "M",
-                        "start": 0,
-                        "type": "Identifier"
-                      },
-                      "path": [],
-                      "start": 0,
-                      "type": "Name",
-                      "type": "Name"
-                    },
-                    "start": 0,
-                    "type": "BinaryExpression",
-                    "type": "BinaryExpression"
-                  },
-                  "operator": "*",
-                  "right": {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "FOS",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  },
-                  "start": 0,
-                  "type": "BinaryExpression",
-                  "type": "BinaryExpression"
-                },
-                "operator": "/",
-                "right": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "left": {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "width",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  },
-                  "operator": "*",
-                  "right": {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "sigmaAllow",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  },
-                  "start": 0,
-                  "type": "BinaryExpression",
-                  "type": "BinaryExpression"
-                },
-                "start": 0,
-                "type": "BinaryExpression",
-                "type": "BinaryExpression"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -468,8 +358,116 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "end": 0,
+              "left": {
+                "commentStart": 0,
+                "end": 0,
+                "left": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "left": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "raw": "6",
+                    "start": 0,
+                    "type": "Literal",
+                    "type": "Literal",
+                    "value": {
+                      "value": 6.0,
+                      "suffix": "None"
+                    }
+                  },
+                  "operator": "*",
+                  "right": {
+                    "abs_path": false,
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": {
+                      "commentStart": 0,
+                      "end": 0,
+                      "name": "M",
+                      "start": 0,
+                      "type": "Identifier"
+                    },
+                    "path": [],
+                    "start": 0,
+                    "type": "Name",
+                    "type": "Name"
+                  },
+                  "start": 0,
+                  "type": "BinaryExpression",
+                  "type": "BinaryExpression"
+                },
+                "operator": "*",
+                "right": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "FOS",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "start": 0,
+                "type": "BinaryExpression",
+                "type": "BinaryExpression"
+              },
+              "operator": "/",
+              "right": {
+                "commentStart": 0,
+                "end": 0,
+                "left": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "width",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "operator": "*",
+                "right": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "sigmaAllow",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                },
+                "start": 0,
+                "type": "BinaryExpression",
+                "type": "BinaryExpression"
+              },
+              "start": 0,
+              "type": "BinaryExpression",
+              "type": "BinaryExpression"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -536,24 +534,6 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -572,8 +552,24 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XY",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [
@@ -1130,15 +1126,6 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1157,8 +1144,15 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [
@@ -1252,24 +1246,6 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "innerEdge",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1288,8 +1264,24 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "innerEdge",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1386,24 +1378,6 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "outerEdge",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1422,8 +1396,24 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "outerEdge",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1875,15 +1865,6 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1902,19 +1883,17 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1933,8 +1912,15 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -1967,15 +1953,6 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -1994,8 +1971,15 @@ description: Result of parsing sketch_on_face_after_fillets_referencing_face.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/ssi_pattern/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing ssi_pattern.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing ssi_pattern.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XZ"
+                }
               },
               {
                 "arguments": [
@@ -404,15 +395,6 @@ description: Result of parsing ssi_pattern.kcl
                       "commentStart": 0,
                       "elements": [
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -431,19 +413,17 @@ description: Result of parsing ssi_pattern.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         },
                         {
-                          "arguments": [
-                            {
-                              "commentStart": 0,
-                              "end": 0,
-                              "start": 0,
-                              "type": "PipeSubstitution",
-                              "type": "PipeSubstitution"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -462,8 +442,15 @@ description: Result of parsing ssi_pattern.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "start": 0,
+                            "type": "PipeSubstitution",
+                            "type": "PipeSubstitution"
+                          }
                         }
                       ],
                       "end": 0,
@@ -514,7 +501,6 @@ description: Result of parsing ssi_pattern.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -533,8 +519,9 @@ description: Result of parsing ssi_pattern.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": null
               }
             ],
             "commentStart": 0,

rust/kcl-lib/tests/subtract_cylinder_from_cube/ast.snap

@@ -24,24 +24,6 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
                   "argument": {
                     "body": [
                       {
-                        "arguments": [
-                          {
-                            "abs_path": false,
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": {
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": "XY",
-                              "start": 0,
-                              "type": "Identifier"
-                            },
-                            "path": [],
-                            "start": 0,
-                            "type": "Name",
-                            "type": "Name"
-                          }
-                        ],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -60,8 +42,24 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": {
+                          "abs_path": false,
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": {
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": "XY",
+                            "start": 0,
+                            "type": "Identifier"
+                          },
+                          "path": [],
+                          "start": 0,
+                          "type": "Name",
+                          "type": "Name"
+                        }
                       },
                       {
                         "arguments": [
@@ -624,7 +622,6 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
                         "unlabeled": null
                       },
                       {
-                        "arguments": [],
                         "callee": {
                           "abs_path": false,
                           "commentStart": 0,
@@ -643,8 +640,9 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
                         "commentStart": 0,
                         "end": 0,
                         "start": 0,
-                        "type": "CallExpression",
+                        "type": "CallExpressionKw",
-                        "type": "CallExpression"
+                        "type": "CallExpressionKw",
+                        "unlabeled": null
                       },
                       {
                         "arguments": [
@@ -751,41 +749,6 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "commentStart": 0,
-                "elements": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "raw": "0",
-                    "start": 0,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 0.0,
-                      "suffix": "None"
-                    }
-                  },
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "raw": "0",
-                    "start": 0,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 0.0,
-                      "suffix": "None"
-                    }
-                  }
-                ],
-                "end": 0,
-                "start": 0,
-                "type": "ArrayExpression",
-                "type": "ArrayExpression"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -804,8 +767,41 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "commentStart": 0,
+              "elements": [
+                {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "0",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 0.0,
+                    "suffix": "None"
+                  }
+                },
+                {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "0",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 0.0,
+                    "suffix": "None"
+                  }
+                }
+              ],
+              "end": 0,
+              "start": 0,
+              "type": "ArrayExpression",
+              "type": "ArrayExpression"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -831,24 +827,6 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -867,8 +845,17 @@ description: Result of parsing subtract_cylinder_from_cube.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XY'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XY"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/tan_arc_x_line/ast.snap

@@ -176,24 +176,6 @@ description: Result of parsing tan_arc_x_line.kcl
         "expression": {
           "body": [
             {
-              "arguments": [
-                {
-                  "abs_path": false,
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": {
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": "XY",
-                    "start": 0,
-                    "type": "Identifier"
-                  },
-                  "path": [],
-                  "start": 0,
-                  "type": "Name",
-                  "type": "Name"
-                }
-              ],
               "callee": {
                 "abs_path": false,
                 "commentStart": 0,
@@ -212,8 +194,17 @@ description: Result of parsing tan_arc_x_line.kcl
               "commentStart": 0,
               "end": 0,
               "start": 0,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": {
+                "commentStart": 0,
+                "end": 0,
+                "raw": "'XY'",
+                "start": 0,
+                "type": "Literal",
+                "type": "Literal",
+                "value": "XY"
+              }
             },
             {
               "arguments": [

rust/kcl-lib/tests/tangent_to_3_point_arc/ast.snap

@@ -18,24 +18,6 @@ description: Result of parsing tangent_to_3_point_arc.kcl
             "type": "Identifier"
           },
           "init": {
-            "arguments": [
-              {
-                "abs_path": false,
-                "commentStart": 0,
-                "end": 0,
-                "name": {
-                  "commentStart": 0,
-                  "end": 0,
-                  "name": "XZ",
-                  "start": 0,
-                  "type": "Identifier"
-                },
-                "path": [],
-                "start": 0,
-                "type": "Name",
-                "type": "Name"
-              }
-            ],
             "callee": {
               "abs_path": false,
               "commentStart": 0,
@@ -54,8 +36,24 @@ description: Result of parsing tangent_to_3_point_arc.kcl
             "commentStart": 0,
             "end": 0,
             "start": 0,
-            "type": "CallExpression",
+            "type": "CallExpressionKw",
-            "type": "CallExpression"
+            "type": "CallExpressionKw",
+            "unlabeled": {
+              "abs_path": false,
+              "commentStart": 0,
+              "end": 0,
+              "name": {
+                "commentStart": 0,
+                "end": 0,
+                "name": "XZ",
+                "start": 0,
+                "type": "Identifier"
+              },
+              "path": [],
+              "start": 0,
+              "type": "Name",
+              "type": "Name"
+            }
           },
           "start": 0,
           "type": "VariableDeclarator"
@@ -380,24 +378,6 @@ description: Result of parsing tangent_to_3_point_arc.kcl
                       "type": "Identifier"
                     },
                     "arg": {
-                      "arguments": [
-                        {
-                          "abs_path": false,
-                          "commentStart": 0,
-                          "end": 0,
-                          "name": {
-                            "commentStart": 0,
-                            "end": 0,
-                            "name": "seg01",
-                            "start": 0,
-                            "type": "Identifier"
-                          },
-                          "path": [],
-                          "start": 0,
-                          "type": "Name",
-                          "type": "Name"
-                        }
-                      ],
                       "callee": {
                         "abs_path": false,
                         "commentStart": 0,
@@ -416,8 +396,24 @@ description: Result of parsing tangent_to_3_point_arc.kcl
                       "commentStart": 0,
                       "end": 0,
                       "start": 0,
-                      "type": "CallExpression",
+                      "type": "CallExpressionKw",
-                      "type": "CallExpression"
+                      "type": "CallExpressionKw",
+                      "unlabeled": {
+                        "abs_path": false,
+                        "commentStart": 0,
+                        "end": 0,
+                        "name": {
+                          "commentStart": 0,
+                          "end": 0,
+                          "name": "seg01",
+                          "start": 0,
+                          "type": "Identifier"
+                        },
+                        "path": [],
+                        "start": 0,
+                        "type": "Name",
+                        "type": "Name"
+                      }
                     }
                   },
                   {

rust/kcl-lib/tests/tangential_arc/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing tangential_arc.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XY",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,24 @@ description: Result of parsing tangential_arc.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "abs_path": false,
+                  "commentStart": 0,
+                  "end": 0,
+                  "name": {
+                    "commentStart": 0,
+                    "end": 0,
+                    "name": "XY",
+                    "start": 0,
+                    "type": "Identifier"
+                  },
+                  "path": [],
+                  "start": 0,
+                  "type": "Name",
+                  "type": "Name"
+                }
               },
               {
                 "arguments": [

rust/kcl-lib/tests/translate_after_fillet/ast.snap

@@ -248,20 +248,6 @@ description: Result of parsing translate_after_fillet.kcl
               },
               "operator": "*",
               "right": {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "raw": "30deg",
-                    "start": 0,
-                    "type": "Literal",
-                    "type": "Literal",
-                    "value": {
-                      "value": 30.0,
-                      "suffix": "Deg"
-                    }
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -273,23 +259,27 @@ description: Result of parsing translate_after_fillet.kcl
                     "start": 0,
                     "type": "Identifier"
                   },
-                  "path": [
+                  "path": [],
-                    {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "math",
-                      "start": 0,
-                      "type": "Identifier"
-                    }
-                  ],
                   "start": 0,
                   "type": "Name"
                 },
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "30deg",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": {
+                    "value": 30.0,
+                    "suffix": "Deg"
+                  }
+                }
               },
               "start": 0,
               "type": "BinaryExpression",
@@ -373,24 +363,6 @@ description: Result of parsing translate_after_fillet.kcl
                     "init": {
                       "body": [
                         {
-                          "arguments": [
-                            {
-                              "abs_path": false,
-                              "commentStart": 0,
-                              "end": 0,
-                              "name": {
-                                "commentStart": 0,
-                                "end": 0,
-                                "name": "XZ",
-                                "start": 0,
-                                "type": "Identifier"
-                              },
-                              "path": [],
-                              "start": 0,
-                              "type": "Name",
-                              "type": "Name"
-                            }
-                          ],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -409,8 +381,24 @@ description: Result of parsing translate_after_fillet.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": {
+                            "abs_path": false,
+                            "commentStart": 0,
+                            "end": 0,
+                            "name": {
+                              "commentStart": 0,
+                              "end": 0,
+                              "name": "XZ",
+                              "start": 0,
+                              "type": "Identifier"
+                            },
+                            "path": [],
+                            "start": 0,
+                            "type": "Name",
+                            "type": "Name"
+                          }
                         },
                         {
                           "arguments": [
@@ -656,24 +644,6 @@ description: Result of parsing translate_after_fillet.kcl
                                     "type": "Name"
                                   },
                                   {
-                                    "arguments": [
-                                      {
-                                        "abs_path": false,
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "name": {
-                                          "commentStart": 0,
-                                          "end": 0,
-                                          "name": "topEdge",
-                                          "start": 0,
-                                          "type": "Identifier"
-                                        },
-                                        "path": [],
-                                        "start": 0,
-                                        "type": "Name",
-                                        "type": "Name"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -692,8 +662,24 @@ description: Result of parsing translate_after_fillet.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "abs_path": false,
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "name": {
+                                        "commentStart": 0,
+                                        "end": 0,
+                                        "name": "topEdge",
+                                        "start": 0,
+                                        "type": "Identifier"
+                                      },
+                                      "path": [],
+                                      "start": 0,
+                                      "type": "Name",
+                                      "type": "Name"
+                                    }
                                   }
                                 ],
                                 "end": 0,
@@ -1317,7 +1303,6 @@ description: Result of parsing translate_after_fillet.kcl
                           "unlabeled": null
                         },
                         {
-                          "arguments": [],
                           "callee": {
                             "abs_path": false,
                             "commentStart": 0,
@@ -1336,8 +1321,9 @@ description: Result of parsing translate_after_fillet.kcl
                           "commentStart": 0,
                           "end": 0,
                           "start": 0,
-                          "type": "CallExpression",
+                          "type": "CallExpressionKw",
-                          "type": "CallExpression"
+                          "type": "CallExpressionKw",
+                          "unlabeled": null
                         },
                         {
                           "arguments": [
@@ -1727,24 +1713,6 @@ description: Result of parsing translate_after_fillet.kcl
                                 "commentStart": 0,
                                 "elements": [
                                   {
-                                    "arguments": [
-                                      {
-                                        "abs_path": false,
-                                        "commentStart": 0,
-                                        "end": 0,
-                                        "name": {
-                                          "commentStart": 0,
-                                          "end": 0,
-                                          "name": "filletEdge",
-                                          "start": 0,
-                                          "type": "Identifier"
-                                        },
-                                        "path": [],
-                                        "start": 0,
-                                        "type": "Name",
-                                        "type": "Name"
-                                      }
-                                    ],
                                     "callee": {
                                       "abs_path": false,
                                       "commentStart": 0,
@@ -1763,8 +1731,24 @@ description: Result of parsing translate_after_fillet.kcl
                                     "commentStart": 0,
                                     "end": 0,
                                     "start": 0,
-                                    "type": "CallExpression",
+                                    "type": "CallExpressionKw",
-                                    "type": "CallExpression"
+                                    "type": "CallExpressionKw",
+                                    "unlabeled": {
+                                      "abs_path": false,
+                                      "commentStart": 0,
+                                      "end": 0,
+                                      "name": {
+                                        "commentStart": 0,
+                                        "end": 0,
+                                        "name": "filletEdge",
+                                        "start": 0,
+                                        "type": "Identifier"
+                                      },
+                                      "path": [],
+                                      "start": 0,
+                                      "type": "Name",
+                                      "type": "Name"
+                                    }
                                   }
                                 ],
                                 "end": 0,
@@ -1978,7 +1962,6 @@ description: Result of parsing translate_after_fillet.kcl
         "expression": {
           "body": [
             {
-              "arguments": [],
               "callee": {
                 "abs_path": false,
                 "commentStart": 0,
@@ -1997,8 +1980,9 @@ description: Result of parsing translate_after_fillet.kcl
               "commentStart": 0,
               "end": 0,
               "start": 0,
-              "type": "CallExpression",
+              "type": "CallExpressionKw",
-              "type": "CallExpression"
+              "type": "CallExpressionKw",
+              "unlabeled": null
             },
             {
               "arguments": [

rust/kcl-lib/tests/xz_plane/ast.snap

@@ -20,24 +20,6 @@ description: Result of parsing xz_plane.kcl
           "init": {
             "body": [
               {
-                "arguments": [
-                  {
-                    "abs_path": false,
-                    "commentStart": 0,
-                    "end": 0,
-                    "name": {
-                      "commentStart": 0,
-                      "end": 0,
-                      "name": "XZ",
-                      "start": 0,
-                      "type": "Identifier"
-                    },
-                    "path": [],
-                    "start": 0,
-                    "type": "Name",
-                    "type": "Name"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -56,8 +38,17 @@ description: Result of parsing xz_plane.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "raw": "'XZ'",
+                  "start": 0,
+                  "type": "Literal",
+                  "type": "Literal",
+                  "value": "XZ"
+                }
               },
               {
                 "arguments": [
@@ -264,15 +255,6 @@ description: Result of parsing xz_plane.kcl
                 "unlabeled": null
               },
               {
-                "arguments": [
-                  {
-                    "commentStart": 0,
-                    "end": 0,
-                    "start": 0,
-                    "type": "PipeSubstitution",
-                    "type": "PipeSubstitution"
-                  }
-                ],
                 "callee": {
                   "abs_path": false,
                   "commentStart": 0,
@@ -291,8 +273,15 @@ description: Result of parsing xz_plane.kcl
                 "commentStart": 0,
                 "end": 0,
                 "start": 0,
-                "type": "CallExpression",
+                "type": "CallExpressionKw",
-                "type": "CallExpression"
+                "type": "CallExpressionKw",
+                "unlabeled": {
+                  "commentStart": 0,
+                  "end": 0,
+                  "start": 0,
+                  "type": "PipeSubstitution",
+                  "type": "PipeSubstitution"
+                }
               },
               {
                 "arguments": [