ByoungSooPark/modeling-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add grouping of module instances in Feature Tree (#6125)

Browse Source 
* Rename operations to be more generic grouping

* Add group enum

* Add module instance groups

* Change to export all operation ts-rs types to the same file

* Fix Feature Tree display of modules to use name

* Ignore clippy warning

* Update output after operation changes

* Change module instances in Feature Tree use to import icon

* Fix error message when attempting to delete module instance
This commit is contained in:
Jonathan Tran
2025-04-03 22:10:39 -04:00
committed by GitHub
parent c7b348390e
commit d38dcb9ba2
65 changed files with 12299 additions and 9315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
rust/kcl-lib/src/execution/cad_op.rs
View File

@ -3,12 +3,12 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use super::{types::NumericType, ArtifactId, KclValue}; use super::{types::NumericType, ArtifactId, KclValue};
use crate::{docs::StdLibFn, std::get_stdlib_fn, SourceRange}; use crate::{docs::StdLibFn, std::get_stdlib_fn, ModuleId, SourceRange};
/// A CAD modeling operation for display in the feature tree, AKA operations /// A CAD modeling operation for display in the feature tree, AKA operations
/// timeline. /// timeline.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(tag = "type")] #[serde(tag = "type")]
pub enum Operation { pub enum Operation {
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
@ -40,7 +40,34 @@ pub enum Operation {
is_error: bool, is_error: bool,
}, },
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
UserDefinedFunctionCall { GroupBegin {
/// The details of the group.
group: Group,
/// The source range of the operation in the source code.
source_range: SourceRange,
},
GroupEnd,
}
impl Operation {
/// If the variant is `StdLibCall`, set the `is_error` field.
pub(crate) fn set_std_lib_call_is_error(&mut self, is_err: bool) {
match self {
Self::StdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::KclStdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::GroupBegin { .. } | Self::GroupEnd => {}
}
}
}
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export_to = "Operation.ts")]
#[serde(tag = "type")]
#[expect(clippy::large_enum_variant)]
pub enum Group {
/// A function call.
#[serde(rename_all = "camelCase")]
FunctionCall {
/// The name of the user-defined function being called. Anonymous /// The name of the user-defined function being called. Anonymous
/// functions have no name. /// functions have no name.
name: Option<String>, name: Option<String>,
@ -51,26 +78,20 @@ pub enum Operation {
unlabeled_arg: Option<OpArg>, unlabeled_arg: Option<OpArg>,
/// The labeled keyword arguments to the function. /// The labeled keyword arguments to the function.
labeled_args: IndexMap<String, OpArg>, labeled_args: IndexMap<String, OpArg>,
/// The source range of the operation in the source code.
source_range: SourceRange,
}, },
UserDefinedFunctionReturn, /// A whole-module import use.
} #[serde(rename_all = "camelCase")]
ModuleInstance {
impl Operation { /// The name of the module being used.
/// If the variant is `StdLibCall`, set the `is_error` field. name: String,
pub(crate) fn set_std_lib_call_is_error(&mut self, is_err: bool) { /// The ID of the module which can be used to determine its path.
match self { module_id: ModuleId,
Self::StdLibCall { ref mut is_error, .. } => *is_error = is_err, },
Self::KclStdLibCall { ref mut is_error, .. } => *is_error = is_err,
Self::UserDefinedFunctionCall { .. } | Self::UserDefinedFunctionReturn => {}
}
}
} }
/// An argument to a CAD modeling operation. /// An argument to a CAD modeling operation.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpArg { pub struct OpArg {
/// The runtime value of the argument. Instead of using [`KclValue`], we /// The runtime value of the argument. Instead of using [`KclValue`], we
@ -90,7 +111,7 @@ impl OpArg {
/// A reference to a standard library function. This exists to implement /// A reference to a standard library function. This exists to implement
/// `PartialEq` and `Eq` for `Operation`. /// `PartialEq` and `Eq` for `Operation`.
#[derive(Debug, Clone, Deserialize, Serialize, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct StdLibFnRef { pub struct StdLibFnRef {
// The following doc comment gets inlined into Operation, overriding what's // The following doc comment gets inlined into Operation, overriding what's
@ -154,7 +175,7 @@ fn is_false(b: &bool) -> bool {
/// A KCL value used in Operations. `ArtifactId`s are used to refer to the /// A KCL value used in Operations. `ArtifactId`s are used to refer to the
/// actual scene objects. Any data not needed in the UI may be omitted. /// actual scene objects. Any data not needed in the UI may be omitted.
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(tag = "type")] #[serde(tag = "type")]
pub enum OpKclValue { pub enum OpKclValue {
Uuid { Uuid {
@ -212,21 +233,21 @@ pub enum OpKclValue {
pub type OpKclObjectFields = IndexMap<String, OpKclValue>; pub type OpKclObjectFields = IndexMap<String, OpKclValue>;
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpSketch { pub struct OpSketch {
artifact_id: ArtifactId, artifact_id: ArtifactId,
} }
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpSolid { pub struct OpSolid {
artifact_id: ArtifactId, artifact_id: ArtifactId,
} }
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, ts_rs::TS, JsonSchema)]
#[ts(export)] #[ts(export_to = "Operation.ts")]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct OpHelix { pub struct OpHelix {
artifact_id: ArtifactId, artifact_id: ArtifactId,

30
rust/kcl-lib/src/execution/exec_ast.rs
View File

@ -3,7 +3,7 @@ use std::collections::HashMap;
use async_recursion::async_recursion; use async_recursion::async_recursion;
use indexmap::IndexMap; use indexmap::IndexMap;
use super::{kcl_value::TypeDef, types::PrimitiveType}; use super::{cad_op::Group, kcl_value::TypeDef, types::PrimitiveType};
use crate::{ use crate::{
engine::ExecutionKind, engine::ExecutionKind,
errors::{KclError, KclErrorDetails}, errors::{KclError, KclErrorDetails},
@ -20,7 +20,7 @@ use crate::{
modules::{ModuleId, ModulePath, ModuleRepr}, modules::{ModuleId, ModulePath, ModuleRepr},
parsing::ast::types::{ parsing::ast::types::{
Annotation, ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem, Annotation, ArrayExpression, ArrayRangeExpression, BinaryExpression, BinaryOperator, BinaryPart, BodyItem,
CallExpression, CallExpressionKw, Expr, FunctionExpression, IfExpression, ImportPath, ImportSelector, BoxNode, CallExpression, CallExpressionKw, Expr, FunctionExpression, IfExpression, ImportPath, ImportSelector,
ItemVisibility, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef, ItemVisibility, LiteralIdentifier, LiteralValue, MemberExpression, MemberObject, Name, Node, NodeRef,
ObjectExpression, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator, ObjectExpression, PipeExpression, Program, TagDeclarator, Type, UnaryExpression, UnaryOperator,
}, },
@ -512,10 +512,19 @@ impl ExecutorContext {
async fn exec_module_for_result( async fn exec_module_for_result(
&self, &self,
module_id: ModuleId, module_id: ModuleId,
module_name: &BoxNode<Name>,
exec_state: &mut ExecState, exec_state: &mut ExecState,
exec_kind: ExecutionKind, exec_kind: ExecutionKind,
source_range: SourceRange, source_range: SourceRange,
) -> Result<Option<KclValue>, KclError> { ) -> Result<Option<KclValue>, KclError> {
exec_state.global.operations.push(Operation::GroupBegin {
group: Group::ModuleInstance {
name: module_name.to_string(),
module_id,
},
source_range,
});
let path = exec_state.global.module_infos[&module_id].path.clone(); let path = exec_state.global.module_infos[&module_id].path.clone();
let mut repr = exec_state.global.module_infos[&module_id].take_repr(); let mut repr = exec_state.global.module_infos[&module_id].take_repr();
// DON'T EARLY RETURN! We need to restore the module repr // DON'T EARLY RETURN! We need to restore the module repr
@ -541,6 +550,9 @@ impl ExecutorContext {
}; };
exec_state.global.module_infos[&module_id].restore_repr(repr); exec_state.global.module_infos[&module_id].restore_repr(repr);
exec_state.global.operations.push(Operation::GroupEnd);
result result
} }
@ -592,7 +604,7 @@ impl ExecutorContext {
Expr::Name(name) => { Expr::Name(name) => {
let value = name.get_result(exec_state, self).await?.clone(); let value = name.get_result(exec_state, self).await?.clone();
if let KclValue::Module { value: module_id, meta } = value { if let KclValue::Module { value: module_id, meta } = value {
self.exec_module_for_result(module_id, exec_state, ExecutionKind::Normal, metadata.source_range) self.exec_module_for_result(module_id, name, exec_state, ExecutionKind::Normal, metadata.source_range)
.await? .await?
.unwrap_or_else(|| { .unwrap_or_else(|| {
exec_state.warn(CompilationError::err( exec_state.warn(CompilationError::err(
@ -1349,7 +1361,7 @@ impl Node<CallExpressionKw> {
if matches!(fn_src, FunctionSource::User { .. }) && !ctx.is_isolated_execution().await { if matches!(fn_src, FunctionSource::User { .. }) && !ctx.is_isolated_execution().await {
// Track return operation. // Track return operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionReturn); exec_state.global.operations.push(Operation::GroupEnd);
} }
let result = return_value.ok_or_else(move || { let result = return_value.ok_or_else(move || {
@ -1459,12 +1471,14 @@ impl Node<CallExpression> {
if !ctx.is_isolated_execution().await { if !ctx.is_isolated_execution().await {
// Track call operation. // Track call operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionCall { exec_state.global.operations.push(Operation::GroupBegin {
group: Group::FunctionCall {
name: Some(fn_name.to_string()), name: Some(fn_name.to_string()),
function_source_range: func.function_def_source_range().unwrap_or_default(), function_source_range: func.function_def_source_range().unwrap_or_default(),
unlabeled_arg: None, unlabeled_arg: None,
// TODO: Add the arguments for legacy positional parameters. // TODO: Add the arguments for legacy positional parameters.
labeled_args: Default::default(), labeled_args: Default::default(),
},
source_range: callsite, source_range: callsite,
}); });
} }
@ -1498,7 +1512,7 @@ impl Node<CallExpression> {
if !ctx.is_isolated_execution().await { if !ctx.is_isolated_execution().await {
// Track return operation. // Track return operation.
exec_state.global.operations.push(Operation::UserDefinedFunctionReturn); exec_state.global.operations.push(Operation::GroupEnd);
} }
Ok(result) Ok(result)
@ -2279,7 +2293,8 @@ impl FunctionSource {
.iter() .iter()
.map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range))) .map(|(k, arg)| (k.clone(), OpArg::new(OpKclValue::from(&arg.value), arg.source_range)))
.collect(); .collect();
exec_state.global.operations.push(Operation::UserDefinedFunctionCall { exec_state.global.operations.push(Operation::GroupBegin {
group: Group::FunctionCall {
name: fn_name, name: fn_name,
function_source_range: ast.as_source_range(), function_source_range: ast.as_source_range(),
unlabeled_arg: args unlabeled_arg: args
@ -2288,6 +2303,7 @@ impl FunctionSource {
.as_ref() .as_ref()
.map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)), .map(|arg| OpArg::new(OpKclValue::from(&arg.value), arg.source_range)),
labeled_args: op_labeled_args, labeled_args: op_labeled_args,
},
source_range: callsite, source_range: callsite,
}); });
} }

909
rust/kcl-lib/tests/add_lots/ops.snap
View File

File diff suppressed because it is too large Load Diff

24
rust/kcl-lib/tests/assembly_mixed_units_cubes/ops.snap
View File

@ -3,6 +3,15 @@ source: kcl-lib/src/simulation_tests.rs
description: Operations executed assembly_mixed_units_cubes.kcl description: Operations executed assembly_mixed_units_cubes.kcl
--- ---
[ [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cubeIn",
"moduleId": 5
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -50,6 +59,18 @@ description: Operations executed assembly_mixed_units_cubes.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cubeMm",
"moduleId": 6
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -96,5 +117,8 @@ description: Operations executed assembly_mixed_units_cubes.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
},
{
"type": "GroupEnd"
} }
] ]

46
rust/kcl-lib/tests/assembly_non_default_units/ops.snap
View File

@ -4,19 +4,13 @@ description: Operations executed assembly_non_default_units.kcl
--- ---
[ [
{ {
"labeledArgs": { "type": "GroupBegin",
"data": { "group": {
"value": { "type": "ModuleInstance",
"type": "String", "name": "other1",
"value": "XZ" "moduleId": 5
}, },
"sourceRange": [] "sourceRange": []
}
},
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -32,5 +26,35 @@ description: Operations executed assembly_non_default_units.kcl
"sourceRange": [], "sourceRange": [],
"type": "StdLibCall", "type": "StdLibCall",
"unlabeledArg": null "unlabeledArg": null
},
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "other2",
"moduleId": 6
},
"sourceRange": []
},
{
"labeledArgs": {
"data": {
"value": {
"type": "String",
"value": "XZ"
},
"sourceRange": []
}
},
"name": "startSketchOn",
"sourceRange": [],
"type": "StdLibCall",
"unlabeledArg": null
},
{
"type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/computed_var/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed computed_var.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -12,10 +14,11 @@ description: Operations executed computed_var.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

7
rust/kcl-lib/tests/cube/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed cube.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -63,6 +65,7 @@ description: Operations executed cube.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
}
}, },
"sourceRange": [] "sourceRange": []
}, },
@ -114,6 +117,6 @@ description: Operations executed cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/cube_with_error/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed cube_with_error.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed cube_with_error.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,6 +66,6 @@ description: Operations executed cube_with_error.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

36
rust/kcl-lib/tests/fillet-and-shell/ops.snap
View File

@ -122,7 +122,9 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1310, 1310,
@ -130,7 +132,8 @@ description: Operations executed fillet-and-shell.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -207,10 +210,12 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1310, 1310,
@ -218,7 +223,8 @@ description: Operations executed fillet-and-shell.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -295,10 +301,12 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1310, 1310,
@ -306,7 +314,8 @@ description: Operations executed fillet-and-shell.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -383,10 +392,12 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "m25Screw", "name": "m25Screw",
"functionSourceRange": [ "functionSourceRange": [
1310, 1310,
@ -394,7 +405,8 @@ description: Operations executed fillet-and-shell.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -471,7 +483,7 @@ description: Operations executed fillet-and-shell.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/function_sketch/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed function_sketch.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "box", "name": "box",
"functionSourceRange": [ "functionSourceRange": [
6, 6,
@ -12,7 +14,8 @@ description: Operations executed function_sketch.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,6 +66,6 @@ description: Operations executed function_sketch.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/function_sketch_with_position/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed function_sketch_with_position.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "box", "name": "box",
"functionSourceRange": [ "functionSourceRange": [
6, 6,
@ -12,7 +14,8 @@ description: Operations executed function_sketch_with_position.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,6 +66,6 @@ description: Operations executed function_sketch_with_position.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

19
rust/kcl-lib/tests/import_foreign/ops.snap
View File

@ -1,5 +1,18 @@
--- ---
source: kcl/src/simulation_tests.rs source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_glob.kcl description: Operations executed import_foreign.kcl
--- ---
[] [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "cube",
"moduleId": 5
},
"sourceRange": []
},
{
"type": "GroupEnd"
}
]

15
rust/kcl-lib/tests/import_transform/ops.snap
View File

@ -2,4 +2,17 @@
source: kcl-lib/src/simulation_tests.rs source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_transform.kcl description: Operations executed import_transform.kcl
--- ---
[] [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "screw",
"moduleId": 5
},
"sourceRange": []
},
{
"type": "GroupEnd"
}
]

12
rust/kcl-lib/tests/import_whole/ops.snap
View File

@ -3,6 +3,15 @@ source: kcl-lib/src/simulation_tests.rs
description: Operations executed import_whole.kcl description: Operations executed import_whole.kcl
--- ---
[ [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "foo",
"moduleId": 5
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -50,6 +59,9 @@ description: Operations executed import_whole.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupEnd"
},
{ {
"labeledArgs": { "labeledArgs": {
"faces": { "faces": {

18
rust/kcl-lib/tests/intersect_cubes/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed intersect_cubes.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed intersect_cubes.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,10 +66,12 @@ description: Operations executed intersect_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -74,7 +79,8 @@ description: Operations executed intersect_cubes.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -125,7 +131,7 @@ description: Operations executed intersect_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/kcl_samples/80-20-rail/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed 80-20-rail.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "rail8020", "name": "rail8020",
"functionSourceRange": [ "functionSourceRange": [
214, 214,
@ -12,7 +14,8 @@ description: Operations executed 80-20-rail.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -297,6 +300,6 @@ description: Operations executed 80-20-rail.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/kcl_samples/ball-bearing/ops.snap
View File

@ -371,7 +371,9 @@ description: Operations executed ball-bearing.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -379,11 +381,12 @@ description: Operations executed ball-bearing.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",

198
rust/kcl-lib/tests/kcl_samples/bench/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed bench.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "divider", "name": "divider",
"functionSourceRange": [ "functionSourceRange": [
1331, 1331,
@ -12,11 +14,14 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch", "name": "dividerSketch",
"functionSourceRange": [ "functionSourceRange": [
309, 309,
@ -24,7 +29,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -43,7 +49,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -72,7 +78,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch", "name": "dividerSketch",
"functionSourceRange": [ "functionSourceRange": [
309, 309,
@ -80,7 +88,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -99,7 +108,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -216,7 +225,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -243,7 +252,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "divider", "name": "divider",
"functionSourceRange": [ "functionSourceRange": [
1331, 1331,
@ -251,11 +262,14 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch", "name": "dividerSketch",
"functionSourceRange": [ "functionSourceRange": [
309, 309,
@ -263,7 +277,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -282,7 +297,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -311,7 +326,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch", "name": "dividerSketch",
"functionSourceRange": [ "functionSourceRange": [
309, 309,
@ -319,7 +336,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -338,7 +356,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -455,7 +473,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -482,7 +500,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "divider", "name": "divider",
"functionSourceRange": [ "functionSourceRange": [
1331, 1331,
@ -490,11 +510,14 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch", "name": "dividerSketch",
"functionSourceRange": [ "functionSourceRange": [
309, 309,
@ -502,7 +525,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -521,7 +545,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -550,7 +574,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "dividerSketch", "name": "dividerSketch",
"functionSourceRange": [ "functionSourceRange": [
309, 309,
@ -558,7 +584,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -577,7 +604,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -694,7 +721,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -721,7 +748,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "connector", "name": "connector",
"functionSourceRange": [ "functionSourceRange": [
1889, 1889,
@ -729,11 +758,14 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "connectorSketch", "name": "connectorSketch",
"functionSourceRange": [ "functionSourceRange": [
1626, 1626,
@ -741,7 +773,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -760,7 +793,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -795,7 +828,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "connectorSketch", "name": "connectorSketch",
"functionSourceRange": [ "functionSourceRange": [
1626, 1626,
@ -803,7 +838,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -822,7 +858,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -857,7 +893,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -884,7 +920,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "seatSlats", "name": "seatSlats",
"functionSourceRange": [ "functionSourceRange": [
2474, 2474,
@ -892,11 +930,14 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "seatSlatSketch", "name": "seatSlatSketch",
"functionSourceRange": [ "functionSourceRange": [
2071, 2071,
@ -904,7 +945,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -923,7 +965,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -975,7 +1017,7 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1002,7 +1044,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "backSlats", "name": "backSlats",
"functionSourceRange": [ "functionSourceRange": [
2993, 2993,
@ -1010,11 +1054,14 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "backSlatsSketch", "name": "backSlatsSketch",
"functionSourceRange": [ "functionSourceRange": [
2580, 2580,
@ -1022,7 +1069,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1041,7 +1089,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1087,10 +1135,12 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRest", "name": "armRest",
"functionSourceRange": [ "functionSourceRange": [
3671, 3671,
@ -1098,7 +1148,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1126,7 +1177,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestPath", "name": "armRestPath",
"functionSourceRange": [ "functionSourceRange": [
3100, 3100,
@ -1134,7 +1187,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1153,7 +1207,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1186,7 +1240,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestProfile", "name": "armRestProfile",
"functionSourceRange": [ "functionSourceRange": [
3344, 3344,
@ -1194,7 +1250,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1213,7 +1270,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1241,10 +1298,12 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRest", "name": "armRest",
"functionSourceRange": [ "functionSourceRange": [
3671, 3671,
@ -1252,7 +1311,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1280,7 +1340,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestPath", "name": "armRestPath",
"functionSourceRange": [ "functionSourceRange": [
3100, 3100,
@ -1288,7 +1350,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1307,7 +1370,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1340,7 +1403,9 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armRestProfile", "name": "armRestProfile",
"functionSourceRange": [ "functionSourceRange": [
3344, 3344,
@ -1348,7 +1413,8 @@ description: Operations executed bench.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1367,7 +1433,7 @@ description: Operations executed bench.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1395,6 +1461,6 @@ description: Operations executed bench.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

87
rust/kcl-lib/tests/kcl_samples/car-wheel-assembly/ops.snap
View File

@ -3,6 +3,15 @@ source: kcl-lib/src/simulation_tests.rs
description: Operations executed car-wheel-assembly.kcl description: Operations executed car-wheel-assembly.kcl
--- ---
[ [
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carRotor",
"moduleId": 6
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -685,6 +694,18 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carWheel",
"moduleId": 5
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -1189,7 +1210,9 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "spoke", "name": "spoke",
"functionSourceRange": [ "functionSourceRange": [
2616, 2616,
@ -1197,7 +1220,8 @@ description: Operations executed car-wheel-assembly.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1573,10 +1597,12 @@ description: Operations executed car-wheel-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "spoke", "name": "spoke",
"functionSourceRange": [ "functionSourceRange": [
2616, 2616,
@ -1584,7 +1610,8 @@ description: Operations executed car-wheel-assembly.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1960,7 +1987,7 @@ description: Operations executed car-wheel-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -2064,7 +2091,21 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "lugNut",
"moduleId": 8
},
"sourceRange": []
},
{
"type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lug", "name": "lug",
"functionSourceRange": [ "functionSourceRange": [
664, 664,
@ -2072,7 +2113,8 @@ description: Operations executed car-wheel-assembly.kcl
8 8
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2347,7 +2389,10 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
},
{
"type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -2498,6 +2543,15 @@ description: Operations executed car-wheel-assembly.kcl
"sourceRange": [] "sourceRange": []
} }
}, },
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "brakeCaliper",
"moduleId": 7
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -2620,6 +2674,18 @@ description: Operations executed car-wheel-assembly.kcl
}, },
"sourceRange": [] "sourceRange": []
}, },
{
"type": "GroupEnd"
},
{
"type": "GroupBegin",
"group": {
"type": "ModuleInstance",
"name": "carTire",
"moduleId": 9
},
"sourceRange": []
},
{ {
"labeledArgs": { "labeledArgs": {
"data": { "data": {
@ -2725,5 +2791,8 @@ description: Operations executed car-wheel-assembly.kcl
} }
}, },
"sourceRange": [] "sourceRange": []
},
{
"type": "GroupEnd"
} }
] ]

54
rust/kcl-lib/tests/kcl_samples/color-cube/ops.snap
View File

@ -148,7 +148,9 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle", "name": "sketchRectangle",
"functionSourceRange": [ "functionSourceRange": [
726, 726,
@ -156,7 +158,8 @@ description: Operations executed color-cube.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -192,10 +195,12 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle", "name": "sketchRectangle",
"functionSourceRange": [ "functionSourceRange": [
726, 726,
@ -203,7 +208,8 @@ description: Operations executed color-cube.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -239,10 +245,12 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle", "name": "sketchRectangle",
"functionSourceRange": [ "functionSourceRange": [
726, 726,
@ -250,7 +258,8 @@ description: Operations executed color-cube.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -286,10 +295,12 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle", "name": "sketchRectangle",
"functionSourceRange": [ "functionSourceRange": [
726, 726,
@ -297,7 +308,8 @@ description: Operations executed color-cube.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -333,10 +345,12 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle", "name": "sketchRectangle",
"functionSourceRange": [ "functionSourceRange": [
726, 726,
@ -344,7 +358,8 @@ description: Operations executed color-cube.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -380,10 +395,12 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sketchRectangle", "name": "sketchRectangle",
"functionSourceRange": [ "functionSourceRange": [
726, 726,
@ -391,7 +408,8 @@ description: Operations executed color-cube.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -427,6 +445,6 @@ description: Operations executed color-cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

144
rust/kcl-lib/tests/kcl_samples/cycloidal-gear/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed cycloidal-gear.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cycloidalGear", "name": "cycloidalGear",
"functionSourceRange": [ "functionSourceRange": [
221, 221,
@ -12,11 +14,14 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gearSketch", "name": "gearSketch",
"functionSourceRange": [ "functionSourceRange": [
447, 447,
@ -24,7 +29,8 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -73,7 +79,9 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -81,14 +89,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -96,14 +107,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -111,14 +125,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -126,11 +143,12 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -159,10 +177,12 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gearSketch", "name": "gearSketch",
"functionSourceRange": [ "functionSourceRange": [
447, 447,
@ -170,7 +190,8 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -213,7 +234,9 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -221,14 +244,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -236,14 +262,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -251,14 +280,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -266,11 +298,12 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -299,10 +332,12 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gearSketch", "name": "gearSketch",
"functionSourceRange": [ "functionSourceRange": [
447, 447,
@ -310,7 +345,8 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -359,7 +395,9 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -367,14 +405,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -382,14 +423,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -397,14 +441,17 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -412,11 +459,12 @@ description: Operations executed cycloidal-gear.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -445,7 +493,7 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -482,6 +530,6 @@ description: Operations executed cycloidal-gear.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

63
rust/kcl-lib/tests/kcl_samples/dodecahedron/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed dodecahedron.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -12,14 +14,17 @@ description: Operations executed dodecahedron.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -27,14 +32,17 @@ description: Operations executed dodecahedron.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -42,14 +50,17 @@ description: Operations executed dodecahedron.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -57,14 +68,17 @@ description: Operations executed dodecahedron.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -72,14 +86,17 @@ description: Operations executed dodecahedron.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -87,14 +104,17 @@ description: Operations executed dodecahedron.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -102,11 +122,12 @@ description: Operations executed dodecahedron.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

36
rust/kcl-lib/tests/kcl_samples/enclosure/ops.snap
View File

@ -145,7 +145,9 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1254, 1254,
@ -153,7 +155,8 @@ description: Operations executed enclosure.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -412,10 +415,12 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1254, 1254,
@ -423,7 +428,8 @@ description: Operations executed enclosure.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -682,10 +688,12 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1254, 1254,
@ -693,7 +701,8 @@ description: Operations executed enclosure.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -952,10 +961,12 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "function001", "name": "function001",
"functionSourceRange": [ "functionSourceRange": [
1254, 1254,
@ -963,7 +974,8 @@ description: Operations executed enclosure.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1222,7 +1234,7 @@ description: Operations executed enclosure.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

108
rust/kcl-lib/tests/kcl_samples/exhaust-manifold/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed exhaust-manifold.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
329, 329,
@ -12,11 +14,14 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -24,14 +29,17 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -39,11 +47,12 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -293,10 +302,12 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
329, 329,
@ -304,11 +315,14 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -316,14 +330,17 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -331,11 +348,12 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -585,10 +603,12 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
329, 329,
@ -596,11 +616,14 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -608,14 +631,17 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -623,11 +649,12 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -877,10 +904,12 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "primaryTube", "name": "primaryTube",
"functionSourceRange": [ "functionSourceRange": [
329, 329,
@ -888,11 +917,14 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -900,14 +932,17 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -915,11 +950,12 @@ description: Operations executed exhaust-manifold.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1169,7 +1205,7 @@ description: Operations executed exhaust-manifold.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/kcl_samples/focusrite-scarlett-mounting-bracket/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bracketSketch", "name": "bracketSketch",
"functionSourceRange": [ "functionSourceRange": [
1212, 1212,
@ -12,7 +14,8 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -207,7 +210,7 @@ description: Operations executed focusrite-scarlett-mounting-bracket.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

108
rust/kcl-lib/tests/kcl_samples/food-service-spatula/ops.snap
View File

@ -19,7 +19,9 @@ description: Operations executed food-service-spatula.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot", "name": "slot",
"functionSourceRange": [ "functionSourceRange": [
481, 481,
@ -27,11 +29,14 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -39,14 +44,17 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -54,17 +62,20 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot", "name": "slot",
"functionSourceRange": [ "functionSourceRange": [
481, 481,
@ -72,11 +83,14 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -84,14 +98,17 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -99,17 +116,20 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot", "name": "slot",
"functionSourceRange": [ "functionSourceRange": [
481, 481,
@ -117,11 +137,14 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -129,14 +152,17 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -144,14 +170,15 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -685,7 +712,9 @@ description: Operations executed food-service-spatula.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "slot", "name": "slot",
"functionSourceRange": [ "functionSourceRange": [
481, 481,
@ -693,11 +722,14 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -705,14 +737,17 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -720,14 +755,15 @@ description: Operations executed food-service-spatula.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/kcl_samples/gear-rack/ops.snap
View File

@ -51,7 +51,9 @@ description: Operations executed gear-rack.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "tooth", "name": "tooth",
"functionSourceRange": [ "functionSourceRange": [
812, 812,
@ -59,7 +61,8 @@ description: Operations executed gear-rack.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -110,7 +113,7 @@ description: Operations executed gear-rack.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

4599
rust/kcl-lib/tests/kcl_samples/gear/ops.snap
View File

File diff suppressed because it is too large Load Diff

54
rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate-magnets/ops.snap
View File

@ -34,7 +34,9 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
868, 868,
@ -42,7 +44,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,7 +260,9 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
868, 868,
@ -265,7 +270,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",
@ -1066,7 +1072,9 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetBase", "name": "magnetBase",
"functionSourceRange": [ "functionSourceRange": [
4348, 4348,
@ -1074,7 +1082,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1093,7 +1102,9 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetCenterCutout", "name": "magnetCenterCutout",
"functionSourceRange": [ "functionSourceRange": [
2697, 2697,
@ -1101,7 +1112,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1120,7 +1132,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1149,7 +1161,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1319,7 +1331,9 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetBase", "name": "magnetBase",
"functionSourceRange": [ "functionSourceRange": [
4348, 4348,
@ -1327,7 +1341,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1346,7 +1361,9 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "magnetCenterCutout", "name": "magnetCenterCutout",
"functionSourceRange": [ "functionSourceRange": [
2697, 2697,
@ -1354,7 +1371,8 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1373,7 +1391,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1402,7 +1420,7 @@ description: Operations executed gridfinity-baseplate-magnets.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

18
rust/kcl-lib/tests/kcl_samples/gridfinity-baseplate/ops.snap
View File

@ -34,7 +34,9 @@ description: Operations executed gridfinity-baseplate.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
745, 745,
@ -42,7 +44,8 @@ description: Operations executed gridfinity-baseplate.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-baseplate.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,7 +260,9 @@ description: Operations executed gridfinity-baseplate.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
745, 745,
@ -265,7 +270,8 @@ description: Operations executed gridfinity-baseplate.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-baseplate.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",

54
rust/kcl-lib/tests/kcl_samples/gridfinity-bins-stacking-lip/ops.snap
View File

@ -34,7 +34,9 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
1133, 1133,
@ -42,7 +44,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,7 +260,9 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
1133, 1133,
@ -265,7 +270,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",
@ -1569,7 +1575,9 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace", "name": "lipFace",
"functionSourceRange": [ "functionSourceRange": [
5302, 5302,
@ -1577,7 +1585,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1772,7 +1781,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1801,7 +1810,9 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace", "name": "lipFace",
"functionSourceRange": [ "functionSourceRange": [
5302, 5302,
@ -1809,7 +1820,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2004,7 +2016,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -2307,7 +2319,9 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace", "name": "lipFace",
"functionSourceRange": [ "functionSourceRange": [
5302, 5302,
@ -2315,7 +2329,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2510,7 +2525,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",
@ -2620,7 +2635,9 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "lipFace", "name": "lipFace",
"functionSourceRange": [ "functionSourceRange": [
5302, 5302,
@ -2628,7 +2645,8 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2817,7 +2835,7 @@ description: Operations executed gridfinity-bins-stacking-lip.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",

18
rust/kcl-lib/tests/kcl_samples/gridfinity-bins/ops.snap
View File

@ -34,7 +34,9 @@ description: Operations executed gridfinity-bins.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
874, 874,
@ -42,7 +44,8 @@ description: Operations executed gridfinity-bins.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -61,7 +64,7 @@ description: Operations executed gridfinity-bins.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -257,7 +260,9 @@ description: Operations executed gridfinity-bins.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "face", "name": "face",
"functionSourceRange": [ "functionSourceRange": [
874, 874,
@ -265,7 +270,8 @@ description: Operations executed gridfinity-bins.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -284,7 +290,7 @@ description: Operations executed gridfinity-bins.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "KclStdLibCall", "type": "KclStdLibCall",

9
rust/kcl-lib/tests/kcl_samples/hex-nut/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed hex-nut.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hexNut", "name": "hexNut",
"functionSourceRange": [ "functionSourceRange": [
503, 503,
@ -12,7 +14,8 @@ description: Operations executed hex-nut.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -89,6 +92,6 @@ description: Operations executed hex-nut.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

234
rust/kcl-lib/tests/kcl_samples/keyboard/ops.snap
View File

@ -189,7 +189,9 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -197,14 +199,17 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -212,7 +217,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -535,10 +541,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -546,7 +554,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -869,10 +878,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -880,7 +891,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1203,10 +1215,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -1214,7 +1228,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1537,10 +1552,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -1548,7 +1565,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1871,10 +1889,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -1882,7 +1902,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2205,10 +2226,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -2216,7 +2239,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2539,10 +2563,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -2550,7 +2576,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2873,10 +2900,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -2884,7 +2913,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -3207,10 +3237,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -3218,7 +3250,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -3541,10 +3574,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -3552,7 +3587,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -3875,10 +3911,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -3886,7 +3924,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -4209,10 +4248,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -4220,7 +4261,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -4543,10 +4585,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -4554,7 +4598,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -4877,10 +4922,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -4888,7 +4935,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -5211,10 +5259,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -5222,7 +5272,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -5545,10 +5596,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -5556,7 +5609,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -5879,10 +5933,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -5890,7 +5946,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -6213,10 +6270,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -6224,7 +6283,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -6547,10 +6607,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -6558,7 +6620,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -6881,10 +6944,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "keyFn", "name": "keyFn",
"functionSourceRange": [ "functionSourceRange": [
1885, 1885,
@ -6892,7 +6957,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -7215,10 +7281,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "sin", "name": "sin",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -7226,14 +7294,17 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "z", "name": "z",
"functionSourceRange": [ "functionSourceRange": [
4939, 4939,
@ -7241,7 +7312,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -7469,10 +7541,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "o", "name": "o",
"functionSourceRange": [ "functionSourceRange": [
6076, 6076,
@ -7480,7 +7554,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -7932,10 +8007,12 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "o", "name": "o",
"functionSourceRange": [ "functionSourceRange": [
6076, 6076,
@ -7943,7 +8020,8 @@ description: Operations executed keyboard.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -8395,6 +8473,6 @@ description: Operations executed keyboard.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

378
rust/kcl-lib/tests/kcl_samples/kitt/ops.snap
View File

@ -51,7 +51,9 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -59,7 +61,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -119,7 +122,7 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -178,7 +181,9 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -186,7 +191,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -246,10 +252,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -257,7 +265,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -317,10 +326,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -328,7 +339,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -388,10 +400,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -399,7 +413,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -459,7 +474,7 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -518,7 +533,9 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -526,7 +543,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -586,10 +604,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -597,7 +617,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -657,10 +678,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -668,7 +691,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -728,10 +752,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -739,7 +765,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -799,10 +826,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -810,7 +839,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -870,10 +900,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -881,7 +913,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -941,10 +974,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -952,7 +987,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1012,10 +1048,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1023,7 +1061,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1083,10 +1122,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1094,7 +1135,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1154,10 +1196,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1165,7 +1209,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1225,10 +1270,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1236,7 +1283,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1296,10 +1344,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1307,7 +1357,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1367,10 +1418,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1378,7 +1431,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1438,10 +1492,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "kitLeg", "name": "kitLeg",
"functionSourceRange": [ "functionSourceRange": [
6080, 6080,
@ -1449,7 +1505,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1500,7 +1557,9 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1508,7 +1567,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1568,13 +1628,15 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "kitLeg", "name": "kitLeg",
"functionSourceRange": [ "functionSourceRange": [
6080, 6080,
@ -1582,7 +1644,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1633,7 +1696,9 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1641,7 +1706,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1701,13 +1767,15 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "kitEar", "name": "kitEar",
"functionSourceRange": [ "functionSourceRange": [
7082, 7082,
@ -1715,11 +1783,14 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1727,7 +1798,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1788,10 +1860,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1799,7 +1873,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1859,10 +1934,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1870,7 +1947,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1930,10 +2008,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -1941,7 +2021,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2001,13 +2082,15 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "kitEar", "name": "kitEar",
"functionSourceRange": [ "functionSourceRange": [
7082, 7082,
@ -2015,11 +2098,14 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2027,7 +2113,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2088,10 +2175,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2099,7 +2188,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2159,10 +2249,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2170,7 +2262,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2230,10 +2323,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2241,7 +2336,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2301,13 +2397,15 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2315,7 +2413,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2376,10 +2475,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2387,7 +2488,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2448,10 +2550,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2459,7 +2563,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2520,10 +2625,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2531,7 +2638,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2592,10 +2700,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2603,7 +2713,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2664,10 +2775,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2675,7 +2788,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2736,10 +2850,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2747,7 +2863,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2808,10 +2925,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2819,7 +2938,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2880,10 +3000,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2891,7 +3013,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2952,10 +3075,12 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pixelBox", "name": "pixelBox",
"functionSourceRange": [ "functionSourceRange": [
95, 95,
@ -2963,7 +3088,8 @@ description: Operations executed kitt.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -3024,6 +3150,6 @@ description: Operations executed kitt.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

90
rust/kcl-lib/tests/kcl_samples/makeup-mirror/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed makeup-mirror.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn", "name": "hingeFn",
"functionSourceRange": [ "functionSourceRange": [
444, 444,
@ -12,7 +14,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -87,10 +90,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn", "name": "hingeFn",
"functionSourceRange": [ "functionSourceRange": [
444, 444,
@ -98,7 +103,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -167,10 +173,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn", "name": "hingeFn",
"functionSourceRange": [ "functionSourceRange": [
444, 444,
@ -178,7 +186,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -247,10 +256,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn", "name": "hingeFn",
"functionSourceRange": [ "functionSourceRange": [
444, 444,
@ -258,7 +269,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -327,10 +339,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn", "name": "hingeFn",
"functionSourceRange": [ "functionSourceRange": [
444, 444,
@ -338,7 +352,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -407,10 +422,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn", "name": "hingeFn",
"functionSourceRange": [ "functionSourceRange": [
444, 444,
@ -418,7 +435,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -487,10 +505,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hingeFn", "name": "hingeFn",
"functionSourceRange": [ "functionSourceRange": [
444, 444,
@ -498,7 +518,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -567,10 +588,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armFn", "name": "armFn",
"functionSourceRange": [ "functionSourceRange": [
1068, 1068,
@ -578,7 +601,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -629,10 +653,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "armFn", "name": "armFn",
"functionSourceRange": [ "functionSourceRange": [
1068, 1068,
@ -640,7 +666,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -691,10 +718,12 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "mirrorFn", "name": "mirrorFn",
"functionSourceRange": [ "functionSourceRange": [
1389, 1389,
@ -702,7 +731,8 @@ description: Operations executed makeup-mirror.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -809,6 +839,6 @@ description: Operations executed makeup-mirror.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/kcl_samples/mounting-plate/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed mounting-plate.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "rectShape", "name": "rectShape",
"functionSourceRange": [ "functionSourceRange": [
519, 519,
@ -12,7 +14,8 @@ description: Operations executed mounting-plate.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed mounting-plate.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

444
rust/kcl-lib/tests/kcl_samples/multi-axis-robot/ops.snap
View File

File diff suppressed because it is too large Load Diff

72
rust/kcl-lib/tests/kcl_samples/pipe-flange-assembly/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed pipe-flange-assembly.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "flange", "name": "flange",
"functionSourceRange": [ "functionSourceRange": [
451, 451,
@ -12,7 +14,8 @@ description: Operations executed pipe-flange-assembly.kcl
6 6
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -295,10 +298,12 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "flange", "name": "flange",
"functionSourceRange": [ "functionSourceRange": [
451, 451,
@ -306,7 +311,8 @@ description: Operations executed pipe-flange-assembly.kcl
6 6
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -589,10 +595,12 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "gasket", "name": "gasket",
"functionSourceRange": [ "functionSourceRange": [
414, 414,
@ -600,7 +608,8 @@ description: Operations executed pipe-flange-assembly.kcl
7 7
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -707,10 +716,12 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "washer", "name": "washer",
"functionSourceRange": [ "functionSourceRange": [
274, 274,
@ -718,7 +729,8 @@ description: Operations executed pipe-flange-assembly.kcl
8 8
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -825,7 +837,7 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1089,7 +1101,9 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt", "name": "bolt",
"functionSourceRange": [ "functionSourceRange": [
364, 364,
@ -1097,7 +1111,8 @@ description: Operations executed pipe-flange-assembly.kcl
9 9
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1303,7 +1318,7 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1455,7 +1470,9 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "hexNut", "name": "hexNut",
"functionSourceRange": [ "functionSourceRange": [
297, 297,
@ -1463,7 +1480,8 @@ description: Operations executed pipe-flange-assembly.kcl
10 10
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1558,7 +1576,7 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1710,7 +1728,9 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pipe", "name": "pipe",
"functionSourceRange": [ "functionSourceRange": [
244, 244,
@ -1718,7 +1738,8 @@ description: Operations executed pipe-flange-assembly.kcl
11 11
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1825,10 +1846,12 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "pipe", "name": "pipe",
"functionSourceRange": [ "functionSourceRange": [
244, 244,
@ -1836,7 +1859,8 @@ description: Operations executed pipe-flange-assembly.kcl
11 11
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1943,6 +1967,6 @@ description: Operations executed pipe-flange-assembly.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

18
rust/kcl-lib/tests/kcl_samples/socket-head-cap-screw/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed socket-head-cap-screw.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -12,14 +14,17 @@ description: Operations executed socket-head-cap-screw.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt", "name": "bolt",
"functionSourceRange": [ "functionSourceRange": [
662, 662,
@ -27,7 +32,8 @@ description: Operations executed socket-head-cap-screw.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -277,6 +283,6 @@ description: Operations executed socket-head-cap-screw.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

198
rust/kcl-lib/tests/kcl_samples/walkie-talkie/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed walkie-talkie.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "body", "name": "body",
"functionSourceRange": [ "functionSourceRange": [
359, 359,
@ -12,7 +14,8 @@ description: Operations executed walkie-talkie.kcl
6 6
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -143,7 +146,9 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -151,14 +156,17 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -166,14 +174,17 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -181,14 +192,17 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -196,11 +210,12 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -347,10 +362,12 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "antenna", "name": "antenna",
"functionSourceRange": [ "functionSourceRange": [
266, 266,
@ -358,7 +375,8 @@ description: Operations executed walkie-talkie.kcl
9 9
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -450,10 +468,12 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "case", "name": "case",
"functionSourceRange": [ "functionSourceRange": [
454, 454,
@ -461,7 +481,8 @@ description: Operations executed walkie-talkie.kcl
7 7
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -555,7 +576,9 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -563,14 +586,17 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -578,14 +604,17 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -593,14 +622,17 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -608,11 +640,12 @@ description: Operations executed walkie-talkie.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1539,7 +1572,9 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "zLogo", "name": "zLogo",
"functionSourceRange": [ "functionSourceRange": [
69, 69,
@ -1547,11 +1582,12 @@ description: Operations executed walkie-talkie.kcl
8 8
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1595,7 +1631,9 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo", "name": "oLogo",
"functionSourceRange": [ "functionSourceRange": [
1146, 1146,
@ -1603,11 +1641,12 @@ description: Operations executed walkie-talkie.kcl
8 8
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1651,7 +1690,9 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo2", "name": "oLogo2",
"functionSourceRange": [ "functionSourceRange": [
1674, 1674,
@ -1659,11 +1700,12 @@ description: Operations executed walkie-talkie.kcl
8 8
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1707,7 +1749,9 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo", "name": "oLogo",
"functionSourceRange": [ "functionSourceRange": [
1146, 1146,
@ -1715,11 +1759,12 @@ description: Operations executed walkie-talkie.kcl
8 8
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1763,7 +1808,9 @@ description: Operations executed walkie-talkie.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "oLogo2", "name": "oLogo2",
"functionSourceRange": [ "functionSourceRange": [
1674, 1674,
@ -1771,11 +1818,12 @@ description: Operations executed walkie-talkie.kcl
8 8
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -1836,10 +1884,12 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "talkButton", "name": "talkButton",
"functionSourceRange": [ "functionSourceRange": [
202, 202,
@ -1847,7 +1897,8 @@ description: Operations executed walkie-talkie.kcl
10 10
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -1954,10 +2005,12 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "knob", "name": "knob",
"functionSourceRange": [ "functionSourceRange": [
298, 298,
@ -1965,7 +2018,8 @@ description: Operations executed walkie-talkie.kcl
11 11
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2070,10 +2124,12 @@ description: Operations executed walkie-talkie.kcl
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button", "name": "button",
"functionSourceRange": [ "functionSourceRange": [
221, 221,
@ -2081,7 +2137,8 @@ description: Operations executed walkie-talkie.kcl
12 12
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2180,10 +2237,12 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button", "name": "button",
"functionSourceRange": [ "functionSourceRange": [
221, 221,
@ -2191,7 +2250,8 @@ description: Operations executed walkie-talkie.kcl
12 12
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2290,10 +2350,12 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button", "name": "button",
"functionSourceRange": [ "functionSourceRange": [
221, 221,
@ -2301,7 +2363,8 @@ description: Operations executed walkie-talkie.kcl
12 12
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2400,10 +2463,12 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "button", "name": "button",
"functionSourceRange": [ "functionSourceRange": [
221, 221,
@ -2411,7 +2476,8 @@ description: Operations executed walkie-talkie.kcl
12 12
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -2510,6 +2576,6 @@ description: Operations executed walkie-talkie.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/kcl_samples/washer/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed washer.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "washer", "name": "washer",
"functionSourceRange": [ "functionSourceRange": [
711, 711,
@ -12,7 +14,8 @@ description: Operations executed washer.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -89,6 +92,6 @@ description: Operations executed washer.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

16
rust/kcl-lib/tests/kw_fn/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed kw_fn.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "increment", "name": "increment",
"functionSourceRange": [ "functionSourceRange": [
12, 12,
@ -12,14 +14,17 @@ description: Operations executed kw_fn.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "add", "name": "add",
"functionSourceRange": [ "functionSourceRange": [
43, 43,
@ -59,10 +64,11 @@ description: Operations executed kw_fn.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
}
}, },
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

5
rust/kcl-lib/tests/kw_fn_too_few_args/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed kw_fn_too_few_args.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "add", "name": "add",
"functionSourceRange": [ "functionSourceRange": [
6, 6,
@ -29,6 +31,7 @@ description: Operations executed kw_fn_too_few_args.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
}
}, },
"sourceRange": [] "sourceRange": []
} }

5
rust/kcl-lib/tests/kw_fn_unlabeled_but_has_label/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed kw_fn_unlabeled_but_has_label.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "add", "name": "add",
"functionSourceRange": [ "functionSourceRange": [
6, 6,
@ -29,6 +31,7 @@ description: Operations executed kw_fn_unlabeled_but_has_label.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
}
}, },
"sourceRange": [] "sourceRange": []
} }

16
rust/kcl-lib/tests/kw_fn_with_defaults/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed kw_fn_with_defaults.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "increment", "name": "increment",
"functionSourceRange": [ "functionSourceRange": [
12, 12,
@ -12,14 +14,17 @@ description: Operations executed kw_fn_with_defaults.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "increment", "name": "increment",
"functionSourceRange": [ "functionSourceRange": [
12, 12,
@ -59,10 +64,11 @@ description: Operations executed kw_fn_with_defaults.kcl
}, },
"sourceRange": [] "sourceRange": []
} }
}
}, },
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/pattern_circular_in_module/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed pattern_circular_in_module.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "thing", "name": "thing",
"functionSourceRange": [ "functionSourceRange": [
15, 15,
@ -12,7 +14,8 @@ description: Operations executed pattern_circular_in_module.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -86,6 +89,6 @@ description: Operations executed pattern_circular_in_module.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

9
rust/kcl-lib/tests/pattern_linear_in_module/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed pattern_linear_in_module.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "thing", "name": "thing",
"functionSourceRange": [ "functionSourceRange": [
15, 15,
@ -12,7 +14,8 @@ description: Operations executed pattern_linear_in_module.kcl
5 5
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -104,6 +107,6 @@ description: Operations executed pattern_linear_in_module.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

18
rust/kcl-lib/tests/pentagon_fillet_sugar/ops.snap
View File

@ -51,7 +51,9 @@ description: Operations executed pentagon_fillet_sugar.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "circl", "name": "circl",
"functionSourceRange": [ "functionSourceRange": [
421, 421,
@ -59,7 +61,8 @@ description: Operations executed pentagon_fillet_sugar.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -88,7 +91,7 @@ description: Operations executed pentagon_fillet_sugar.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -172,7 +175,9 @@ description: Operations executed pentagon_fillet_sugar.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "circl", "name": "circl",
"functionSourceRange": [ "functionSourceRange": [
421, 421,
@ -180,7 +185,8 @@ description: Operations executed pentagon_fillet_sugar.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -209,7 +215,7 @@ description: Operations executed pentagon_fillet_sugar.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

18
rust/kcl-lib/tests/pipe_as_arg/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed pipe_as_arg.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "double", "name": "double",
"functionSourceRange": [ "functionSourceRange": [
404, 404,
@ -12,14 +14,17 @@ description: Operations executed pipe_as_arg.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -27,7 +32,8 @@ description: Operations executed pipe_as_arg.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -72,6 +78,6 @@ description: Operations executed pipe_as_arg.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

18
rust/kcl-lib/tests/riddle_small/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed riddle_small.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "t", "name": "t",
"functionSourceRange": [ "functionSourceRange": [
20, 20,
@ -12,14 +14,17 @@ description: Operations executed riddle_small.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "t", "name": "t",
"functionSourceRange": [ "functionSourceRange": [
20, 20,
@ -27,11 +32,12 @@ description: Operations executed riddle_small.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

18
rust/kcl-lib/tests/rotate_after_fillet/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed rotate_after_fillet.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -12,14 +14,17 @@ description: Operations executed rotate_after_fillet.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt", "name": "bolt",
"functionSourceRange": [ "functionSourceRange": [
264, 264,
@ -27,7 +32,8 @@ description: Operations executed rotate_after_fillet.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -277,6 +283,6 @@ description: Operations executed rotate_after_fillet.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

18
rust/kcl-lib/tests/scale_after_fillet/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed scale_after_fillet.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -12,14 +14,17 @@ description: Operations executed scale_after_fillet.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt", "name": "bolt",
"functionSourceRange": [ "functionSourceRange": [
264, 264,
@ -27,7 +32,8 @@ description: Operations executed scale_after_fillet.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -277,6 +283,6 @@ description: Operations executed scale_after_fillet.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

18
rust/kcl-lib/tests/sketch_in_object/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed sketch_in_object.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "test", "name": "test",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed sketch_in_object.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_in_object.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {
@ -66,7 +69,9 @@ description: Operations executed sketch_in_object.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "test2", "name": "test2",
"functionSourceRange": [ "functionSourceRange": [
180, 180,
@ -74,7 +79,8 @@ description: Operations executed sketch_in_object.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -93,7 +99,7 @@ description: Operations executed sketch_in_object.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/sketch_on_face_circle_tagged/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed sketch_on_face_circle_tagged.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed sketch_on_face_circle_tagged.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_circle_tagged.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/sketch_on_face_end/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed sketch_on_face_end.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed sketch_on_face_end.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_end.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/sketch_on_face_end_negative_extrude/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_end_negative_extrude.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/sketch_on_face_start/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed sketch_on_face_start.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed sketch_on_face_start.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -31,7 +34,7 @@ description: Operations executed sketch_on_face_start.kcl
"unlabeledArg": null "unlabeledArg": null
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

9
rust/kcl-lib/tests/subtract_cylinder_from_cube/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed subtract_cylinder_from_cube.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed subtract_cylinder_from_cube.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,7 +66,7 @@ description: Operations executed subtract_cylinder_from_cube.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

18
rust/kcl-lib/tests/translate_after_fillet/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed translate_after_fillet.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cos", "name": "cos",
"functionSourceRange": [ "functionSourceRange": [
0, 0,
@ -12,14 +14,17 @@ description: Operations executed translate_after_fillet.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "bolt", "name": "bolt",
"functionSourceRange": [ "functionSourceRange": [
264, 264,
@ -27,7 +32,8 @@ description: Operations executed translate_after_fillet.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -277,6 +283,6 @@ description: Operations executed translate_after_fillet.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
} }
] ]

18
rust/kcl-lib/tests/union_cubes/ops.snap
View File

@ -4,7 +4,9 @@ description: Operations executed union_cubes.kcl
--- ---
[ [
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -12,7 +14,8 @@ description: Operations executed union_cubes.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -63,10 +66,12 @@ description: Operations executed union_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"type": "UserDefinedFunctionCall", "type": "GroupBegin",
"group": {
"type": "FunctionCall",
"name": "cube", "name": "cube",
"functionSourceRange": [ "functionSourceRange": [
7, 7,
@ -74,7 +79,8 @@ description: Operations executed union_cubes.kcl
0 0
], ],
"unlabeledArg": null, "unlabeledArg": null,
"labeledArgs": {}, "labeledArgs": {}
},
"sourceRange": [] "sourceRange": []
}, },
{ {
@ -125,7 +131,7 @@ description: Operations executed union_cubes.kcl
} }
}, },
{ {
"type": "UserDefinedFunctionReturn" "type": "GroupEnd"
}, },
{ {
"labeledArgs": { "labeledArgs": {

22
src/components/ModelingSidebar/ModelingPanes/FeatureTreePane.tsx
View File

@ -289,10 +289,7 @@ const OperationItem = (props: {
send: Prop<Actor<typeof featureTreeMachine>, 'send'> send: Prop<Actor<typeof featureTreeMachine>, 'send'>
}) => { }) => {
const kclContext = useKclContext() const kclContext = useKclContext()
const name = const name = getOperationLabel(props.item)
'name' in props.item && props.item.name !== null
? getOperationLabel(props.item)
: 'anonymous'
const errors = useMemo(() => { const errors = useMemo(() => {
return kclContext.diagnostics.filter( return kclContext.diagnostics.filter(
(diag) => (diag) =>
@ -304,7 +301,7 @@ const OperationItem = (props: {
}, [kclContext.diagnostics.length]) }, [kclContext.diagnostics.length])
function selectOperation() { function selectOperation() {
if (props.item.type === 'UserDefinedFunctionReturn') { if (props.item.type === 'GroupEnd') {
return return
} }
props.send({ props.send({
@ -352,7 +349,7 @@ const OperationItem = (props: {
function deleteOperation() { function deleteOperation() {
if ( if (
props.item.type === 'StdLibCall' || props.item.type === 'StdLibCall' ||
props.item.type === 'UserDefinedFunctionCall' || props.item.type === 'GroupBegin' ||
props.item.type === 'KclStdLibCall' props.item.type === 'KclStdLibCall'
) { ) {
props.send({ props.send({
@ -368,7 +365,7 @@ const OperationItem = (props: {
() => [ () => [
<ContextMenuItem <ContextMenuItem
onClick={() => { onClick={() => {
if (props.item.type === 'UserDefinedFunctionReturn') { if (props.item.type === 'GroupEnd') {
return return
} }
props.send({ props.send({
@ -381,14 +378,19 @@ const OperationItem = (props: {
> >
View KCL source code View KCL source code
</ContextMenuItem>, </ContextMenuItem>,
...(props.item.type === 'UserDefinedFunctionCall' ...(props.item.type === 'GroupBegin' &&
props.item.group.type === 'FunctionCall'
? [ ? [
<ContextMenuItem <ContextMenuItem
onClick={() => { onClick={() => {
if (props.item.type !== 'UserDefinedFunctionCall') { if (props.item.type !== 'GroupBegin') {
return return
} }
const functionRange = props.item.functionSourceRange if (props.item.group.type !== 'FunctionCall') {
// TODO: Add module instance support.
return
}
const functionRange = props.item.group.functionSourceRange
// For some reason, the cursor goes to the end of the source // For some reason, the cursor goes to the end of the source
// range we select. So set the end equal to the beginning. // range we select. So set the end equal to the beginning.
functionRange[1] = functionRange[0] functionRange[1] = functionRange[0]

6
src/lang/modifyAst.ts
View File

@ -1303,7 +1303,9 @@ export async function deleteFromSelection(
if (!pathToNode) return new Error('Could not find extrude variable') if (!pathToNode) return new Error('Could not find extrude variable')
} else { } else {
pathToNode = selection.codeRef.pathToNode pathToNode = selection.codeRef.pathToNode
if (varDec.node.type !== 'VariableDeclarator') { if (varDec.node.type === 'VariableDeclarator') {
extrudeNameToDelete = varDec.node.id.name
} else if (varDec.node.type === 'CallExpression') {
const callExp = getNodeFromPath<CallExpression>( const callExp = getNodeFromPath<CallExpression>(
astClone, astClone,
pathToNode, pathToNode,
@ -1312,7 +1314,7 @@ export async function deleteFromSelection(
if (err(callExp)) return callExp if (err(callExp)) return callExp
extrudeNameToDelete = callExp.node.callee.name.name extrudeNameToDelete = callExp.node.callee.name.name
} else { } else {
extrudeNameToDelete = varDec.node.id.name return new Error('Could not find extrude variable or call')
} }
} }

7
src/lib/operations.test.ts
View File

@ -16,17 +16,20 @@ function stdlib(name: string): Operation {
function userCall(name: string): Operation { function userCall(name: string): Operation {
return { return {
type: 'UserDefinedFunctionCall', type: 'GroupBegin',
group: {
type: 'FunctionCall',
name, name,
functionSourceRange: defaultSourceRange(), functionSourceRange: defaultSourceRange(),
unlabeledArg: null, unlabeledArg: null,
labeledArgs: {}, labeledArgs: {},
},
sourceRange: defaultSourceRange(), sourceRange: defaultSourceRange(),
} }
} }
function userReturn(): Operation { function userReturn(): Operation {
return { return {
type: 'UserDefinedFunctionReturn', type: 'GroupEnd',
} }
} }

83
src/lib/operations.ts
View File

@ -1,5 +1,4 @@
import type { Operation } from '@rust/kcl-lib/bindings/Operation' import type { Operation, OpKclValue } from '@rust/kcl-lib/bindings/Operation'
import type { OpKclValue } from '@rust/kcl-lib/bindings/OpKclValue'
import type { CustomIconName } from '@src/components/CustomIcon' import type { CustomIconName } from '@src/components/CustomIcon'
import { getNodePathFromSourceRange } from '@src/lang/queryAstNodePathUtils' import { getNodePathFromSourceRange } from '@src/lang/queryAstNodePathUtils'
@ -1118,10 +1117,20 @@ export function getOperationLabel(op: Operation): string {
return stdLibMap[op.name]?.label ?? op.name return stdLibMap[op.name]?.label ?? op.name
case 'KclStdLibCall': case 'KclStdLibCall':
return stdLibMap[op.name]?.label ?? op.name return stdLibMap[op.name]?.label ?? op.name
case 'UserDefinedFunctionCall': case 'GroupBegin':
return op.name ?? 'Anonymous custom function' if (op.group.type === 'FunctionCall') {
case 'UserDefinedFunctionReturn': return op.group.name ?? 'anonymous'
return 'User function return' } else if (op.group.type === 'ModuleInstance') {
return op.group.name
} else {
const _exhaustiveCheck: never = op.group
return '' // unreachable
}
case 'GroupEnd':
return 'Group end'
default:
const _exhaustiveCheck: never = op
return '' // unreachable
} }
} }
@ -1134,8 +1143,16 @@ export function getOperationIcon(op: Operation): CustomIconName {
return stdLibMap[op.name]?.icon ?? 'questionMark' return stdLibMap[op.name]?.icon ?? 'questionMark'
case 'KclStdLibCall': case 'KclStdLibCall':
return stdLibMap[op.name]?.icon ?? 'questionMark' return stdLibMap[op.name]?.icon ?? 'questionMark'
default: case 'GroupBegin':
if (op.group.type === 'ModuleInstance') {
return 'import' // TODO: Use insert icon.
}
return 'make-variable' return 'make-variable'
case 'GroupEnd':
return 'questionMark'
default:
const _exhaustiveCheck: never = op
return 'questionMark' // unreachable
} }
} }
@ -1151,31 +1168,31 @@ export function filterOperations(operations: Operation[]): Operation[] {
* for use in the feature tree UI * for use in the feature tree UI
*/ */
const operationFilters = [ const operationFilters = [
isNotUserFunctionWithNoOperations, isNotGroupWithNoOperations,
isNotInsideUserFunction, isNotInsideGroup,
isNotUserFunctionReturn, isNotGroupEnd,
] ]
/** /**
* A filter to exclude everything that occurs inside a UserDefinedFunctionCall * A filter to exclude everything that occurs inside a GroupBegin and its
* and its corresponding UserDefinedFunctionReturn from a list of operations. * corresponding GroupEnd from a list of operations. This works even when there
* This works even when there are nested function calls. * are nested function calls and module instances.
*/ */
function isNotInsideUserFunction(operations: Operation[]): Operation[] { function isNotInsideGroup(operations: Operation[]): Operation[] {
const ops: Operation[] = [] const ops: Operation[] = []
let depth = 0 let depth = 0
for (const op of operations) { for (const op of operations) {
if (depth === 0) { if (depth === 0) {
ops.push(op) ops.push(op)
} }
if (op.type === 'UserDefinedFunctionCall') { if (op.type === 'GroupBegin') {
depth++ depth++
} }
if (op.type === 'UserDefinedFunctionReturn') { if (op.type === 'GroupEnd') {
depth-- depth--
console.assert( console.assert(
depth >= 0, depth >= 0,
'Unbalanced UserDefinedFunctionCall and UserDefinedFunctionReturn; too many returns' 'Unbalanced GroupBegin and GroupEnd; too many ends'
) )
} }
} }
@ -1184,26 +1201,23 @@ function isNotInsideUserFunction(operations: Operation[]): Operation[] {
} }
/** /**
* A filter to exclude UserDefinedFunctionCall operations and their * A filter to exclude GroupBegin operations and their corresponding GroupEnd
* corresponding UserDefinedFunctionReturn that don't have any operations inside * that don't have any operations inside them from a list of operations.
* them from a list of operations.
*/ */
function isNotUserFunctionWithNoOperations( function isNotGroupWithNoOperations(operations: Operation[]): Operation[] {
operations: Operation[]
): Operation[] {
return operations.filter((op, index) => { return operations.filter((op, index) => {
if ( if (
op.type === 'UserDefinedFunctionCall' && op.type === 'GroupBegin' &&
// If this is a call at the end of the array, it's preserved. // If this is a begin at the end of the array, it's preserved.
index < operations.length - 1 && index < operations.length - 1 &&
operations[index + 1].type === 'UserDefinedFunctionReturn' operations[index + 1].type === 'GroupEnd'
) )
return false return false
if ( if (
op.type === 'UserDefinedFunctionReturn' && op.type === 'GroupEnd' &&
// If this return is at the beginning of the array, it's preserved. // If this is an end at the beginning of the array, it's preserved.
index > 0 && index > 0 &&
operations[index - 1].type === 'UserDefinedFunctionCall' operations[index - 1].type === 'GroupBegin'
) )
return false return false
@ -1212,11 +1226,10 @@ function isNotUserFunctionWithNoOperations(
} }
/** /**
* A filter to exclude UserDefinedFunctionReturn operations from a list of * A filter to exclude GroupEnd operations from a list of operations.
* operations.
*/ */
function isNotUserFunctionReturn(ops: Operation[]): Operation[] { function isNotGroupEnd(ops: Operation[]): Operation[] {
return ops.filter((op) => op.type !== 'UserDefinedFunctionReturn') return ops.filter((op) => op.type !== 'GroupEnd')
} }
export interface EnterEditFlowProps { export interface EnterEditFlowProps {
@ -1230,7 +1243,7 @@ export async function enterEditFlow({
}: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> { }: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> {
if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') { if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') {
return new Error( return new Error(
'Feature tree editing not yet supported for user-defined functions. Please edit in the code editor.' 'Feature tree editing not yet supported for user-defined functions or modules. Please edit in the code editor.'
) )
} }
const stdLibInfo = stdLibMap[operation.name] const stdLibInfo = stdLibMap[operation.name]
@ -1269,7 +1282,7 @@ export async function enterAppearanceFlow({
}: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> { }: EnterEditFlowProps): Promise<Error | CommandBarMachineEvent> {
if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') { if (operation.type !== 'StdLibCall' && operation.type !== 'KclStdLibCall') {
return new Error( return new Error(
'Appearance setting not yet supported for user-defined functions. Please edit in the code editor.' 'Appearance setting not yet supported for user-defined functions or modules. Please edit in the code editor.'
) )
} }
const stdLibInfo = stdLibMap[operation.name] const stdLibInfo = stdLibMap[operation.name]