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

Fix bad merge with some KCL snapshots (#6239)

Browse Source 
Caused by admin merge in #5803
This commit is contained in:
Adam Chalmers
2025-04-09 15:43:56 -05:00
committed by GitHub
parent d275995dfe
commit 0c6b6bf5d5
4 changed files with 3 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/kcl-lib/tests/big_number_angle_to_match_length_y/ast.snap
View File

@ -286,7 +286,7 @@ description: Result of parsing big_number_angle_to_match_length_y.kcl
"label": {
"commentStart": 0,
"end": 0,
"name": "endAbsoluteY",
"name": "endAbsoluteX",
"start": 0,
"type": "Identifier"
},

2
rust/kcl-lib/tests/big_number_angle_to_match_length_y/unparsed.snap
View File

@ -5,6 +5,6 @@ description: Result of unparsing big_number_angle_to_match_length_y.kcl
part001 = startSketchOn(XY)
|> startProfileAt([0, 0], %)
|> line(end = [1, 3.82], tag = $seg01)
|> angledLine(angle = -angleToMatchLengthY(seg01, 3, %), endAbsoluteY = 3)
|> angledLine(angle = -angleToMatchLengthY(seg01, 3, %), endAbsoluteX = 3)
|> close(%)
|> extrude(length = 10)

80
rust/kcl-lib/tests/kcl_samples/food-service-spatula/ast.snap
View File

@ -1860,46 +1860,6 @@ description: Result of parsing food-service-spatula.kcl
"type": "Name",
"type": "Name"
}
},
{
<<<<<<< HEAD
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tag",
"start": 0,
"type": "Identifier"
},
"arg": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "TagDeclarator",
"type": "TagDeclarator",
"value": "line000"
}
||||||| e5f23a49b
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
},
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "TagDeclarator",
"type": "TagDeclarator",
"value": "line000"
=======
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
>>>>>>> main
}
],
"callee": {
@ -2099,46 +2059,6 @@ description: Result of parsing food-service-spatula.kcl
"type": "UnaryExpression",
"type": "UnaryExpression"
}
},
{
<<<<<<< HEAD
"type": "LabeledArg",
"label": {
"commentStart": 0,
"end": 0,
"name": "tag",
"start": 0,
"type": "Identifier"
},
"arg": {
"commentStart": 0,
"end": 0,
"start": 0,
"type": "TagDeclarator",
"type": "TagDeclarator",
"value": "line001"
}
||||||| e5f23a49b
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
},
{
"commentStart": 0,
"end": 0,
"start": 0,
"type": "TagDeclarator",
"type": "TagDeclarator",
"value": "line001"
=======
"commentStart": 0,
"end": 0,
"start": 0,
"type": "PipeSubstitution",
"type": "PipeSubstitution"
>>>>>>> main
}
],
"callee": {

2
rust/kcl-lib/tests/kcl_samples/sheet-metal-bracket/ast.snap
View File

@ -1142,7 +1142,7 @@ description: Result of parsing sheet-metal-bracket.kcl
"label": {
"commentStart": 0,
"end": 0,
"name": "lengthY",
"name": "endAbsoluteY",
"start": 0,
"type": "Identifier"
},