Skip to content

Commit 6cb899d

Browse files
nrcnrc
committed
More warnings
Signed-off-by: Nick Cameron <[email protected]>
1 parent 20c074d commit 6cb899d

File tree

14 files changed

+191
-158
lines changed

14 files changed

+191
-158
lines changed

‎e2e/playwright/editor-tests.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ a1 = startSketchOn(offsetPlane(XY, offset = 10))
912912
|> close()
913913
|> revolve(
914914
axis = revolveAxis,
915-
angle = 90
915+
angle = 90deg
916916
)
917917
`
918918
)

‎e2e/playwright/point-click.spec.ts

Lines changed: 68 additions & 70 deletions
Large diffs are not rendered by default.

‎e2e/playwright/sketch-tests.spec.ts

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,8 +2300,8 @@ profile001 = startProfile(sketch001, at = [6.24, 4.54])
23002300
|> line(end = [8.61, 0.74])
23012301
|> line(end = [10.99, -5.22])
23022302
profile002 = startProfile(sketch001, at = [11.19, 5.02])
2303-
|> angledLine(angle = 0, length = 10.78, tag = $rectangleSegmentA001)
2304-
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 4.14)
2303+
|> angledLine(angle = 0deg, length = 10.78, tag = $rectangleSegmentA001)
2304+
|> angledLine(angle = segAng(rectangleSegmentA001) - 90deg, length = 4.14)
23052305
|> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001))
23062306
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
23072307
|> close()
@@ -2373,7 +2373,7 @@ profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07]
23732373
await page.mouse.up()
23742374
await page.waitForTimeout(200)
23752375
await editor.expectEditor.toContain(
2376-
`angledLine(angle = -7, length = 10.27, tag = $rectangleSegmentA001)`
2376+
`angledLine(angle = -7deg, length = 10.27, tag = $rectangleSegmentA001)`
23772377
)
23782378
})
23792379

@@ -2415,8 +2415,8 @@ profile004 = circleThreePoint(sketch001, p1 = [13.44, -6.8], p2 = [13.39, -2.07]
24152415
await page.waitForTimeout(100)
24162416
await rectEnd()
24172417
await editor.expectEditor.toContain(
2418-
`|> angledLine(angle = 180, length = 1.97, tag = $rectangleSegmentA002)
2419-
|> angledLine(angle = segAng(rectangleSegmentA002) + 90, length = 3.89)
2418+
`|> angledLine(angle = 180deg, length = 1.97, tag = $rectangleSegmentA002)
2419+
|> angledLine(angle = segAng(rectangleSegmentA002) + 90deg, length = 3.89)
24202420
|> angledLine(angle = segAng(rectangleSegmentA002), length = -segLen(rectangleSegmentA002))
24212421
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
24222422
|> close()`.replaceAll('\n', '')
@@ -2441,8 +2441,8 @@ profile001 = startProfile(sketch001, at = [6.24, 4.54])
24412441
|> line(end = [8.61, 0.74])
24422442
|> line(end = [10.99, -5.22])
24432443
profile002 = startProfile(sketch001, at = [11.19, 5.02])
2444-
|> angledLine(angle = 0, length = 10.78, tag = $rectangleSegmentA001)
2445-
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 4.14)
2444+
|> angledLine(angle = 0deg, length = 10.78, tag = $rectangleSegmentA001)
2445+
|> angledLine(angle = segAng(rectangleSegmentA001) - 90deg, length = 4.14)
24462446
|> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001))
24472447
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
24482448
|> close()
@@ -2771,8 +2771,8 @@ profile002 = startProfile(sketch002, at = [0.75, 13.46])
27712771
|> line(end = [4.52, 3.79])
27722772
|> line(end = [5.98, -2.81])
27732773
profile003 = startProfile(sketch002, at = [3.19, 13.3])
2774-
|> angledLine(angle = 0, length = 6.64, tag = $rectangleSegmentA001)
2775-
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 2.81)
2774+
|> angledLine(angle = 0deg, length = 6.64, tag = $rectangleSegmentA001)
2775+
|> angledLine(angle = segAng(rectangleSegmentA001) - 90deg, length = 2.81)
27762776
|> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001))
27772777
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
27782778
|> close()
@@ -2789,7 +2789,7 @@ profile006 = startProfile(sketch002, at = [9.65, 3.82])
27892789
|> close()
27902790
revolve001 = revolve(
27912791
profile004,
2792-
angle = 45,
2792+
angle = 45deg,
27932793
axis = getNextAdjacentEdge(seg01)
27942794
)
27952795
extrude002 = extrude(profile006, length = 4)
@@ -2813,8 +2813,8 @@ profile010 = circle(
28132813
radius = 2.67
28142814
)
28152815
profile011 = startProfile(sketch003, at = [5.07, -6.39])
2816-
|> angledLine(angle = 0, length = 4.54, tag = $rectangleSegmentA002)
2817-
|> angledLine(angle = segAng(rectangleSegmentA002) - 90, length = 4.17)
2816+
|> angledLine(angle = 0deg, length = 4.54, tag = $rectangleSegmentA002)
2817+
|> angledLine(angle = segAng(rectangleSegmentA002) - 90deg, length = 4.17)
28182818
|> angledLine(angle = segAng(rectangleSegmentA002), length = -segLen(rectangleSegmentA002))
28192819
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
28202820
|> close()
@@ -2966,7 +2966,7 @@ loft([profile001, profile002])
29662966
)
29672967
await rect1Crn2()
29682968
await editor.expectEditor.toContain(
2969-
`angledLine(angle = 0, length = 113.01, tag = $rectangleSegmentA001)`
2969+
`angledLine(angle = 0deg, length = 113.01, tag = $rectangleSegmentA001)`
29702970
)
29712971
})
29722972
test('Can enter sketch loft edges offsetPlane and continue sketch', async ({
@@ -3035,7 +3035,7 @@ loft([profile001, profile002])
30353035
)
30363036
await rect1Crn2()
30373037
await editor.expectEditor.toContain(
3038-
`angledLine(angle = 0, length = 106.42], tag = $rectangleSegmentA001)`
3038+
`angledLine(angle = 0deg, length = 106.42], tag = $rectangleSegmentA001)`
30393039
)
30403040
await page.waitForTimeout(100)
30413041
})
@@ -3257,8 +3257,8 @@ test.describe('manual edits during sketch mode', () => {
32573257
extrude001 = extrude(profile001, length = 500)
32583258
sketch002 = startSketchOn(extrude001, face = seg01)
32593259
profile002 = startProfile(sketch002, at = [83.39, 329.15])
3260-
|> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
3261-
|> angledLine(length = 156.54, angle = -28)
3260+
|> angledLine(angle = 0deg, length = 119.61, tag = $rectangleSegmentA001)
3261+
|> angledLine(length = 156.54, angle = -28deg)
32623262
|> angledLine(
32633263
angle = -151,
32643264
length = 116.27,
@@ -3296,7 +3296,9 @@ test.describe('manual edits during sketch mode', () => {
32963296
await expect
32973297
.poll(
32983298
async () => {
3299-
await editor.expectEditor.toContain('length = 156.54, angle = -28')
3299+
await editor.expectEditor.toContain(
3300+
'length = 156.54, angle = -28deg'
3301+
)
33003302
await page.mouse.move(handle1Location.x, handle1Location.y)
33013303
await page.mouse.down()
33023304
await page.mouse.move(
@@ -3307,7 +3309,9 @@ test.describe('manual edits during sketch mode', () => {
33073309
}
33083310
)
33093311
await page.mouse.up()
3310-
await editor.expectEditor.toContain('length = 231.59, angle = -34')
3312+
await editor.expectEditor.toContain(
3313+
'length = 231.59, angle = -34deg'
3314+
)
33113315
return true
33123316
},
33133317
{ timeout: 10_000 }
@@ -3325,7 +3329,7 @@ test.describe('manual edits during sketch mode', () => {
33253329

33263330
const handle2Location = { x: 872, y: 273 }
33273331
await test.step('Edit sketch again', async () => {
3328-
await editor.expectEditor.toContain('length = 231.59, angle = -34')
3332+
await editor.expectEditor.toContain('length = 231.59, angle = -34deg')
33293333
await page.waitForTimeout(500)
33303334
await expect
33313335
.poll(
@@ -3336,7 +3340,9 @@ test.describe('manual edits during sketch mode', () => {
33363340
steps: 5,
33373341
})
33383342
await page.mouse.up()
3339-
await editor.expectEditor.toContain('length = 167.36, angle = -14')
3343+
await editor.expectEditor.toContain(
3344+
'length = 167.36, angle = -14deg'
3345+
)
33403346
return true
33413347
},
33423348
{ timeout: 10_000 }
@@ -3361,14 +3367,18 @@ test.describe('manual edits during sketch mode', () => {
33613367
await expect
33623368
.poll(
33633369
async () => {
3364-
await editor.expectEditor.toContain('length = 167.36, angle = -14')
3370+
await editor.expectEditor.toContain(
3371+
'length = 167.36, angle = -14deg'
3372+
)
33653373
await page.mouse.move(handle3Location.x, handle3Location.y)
33663374
await page.mouse.down()
33673375
await page.mouse.move(handle3Location.x, handle3Location.y + 110, {
33683376
steps: 5,
33693377
})
33703378
await page.mouse.up()
3371-
await editor.expectEditor.toContain('length = 219.2, angle = -56')
3379+
await editor.expectEditor.toContain(
3380+
'length = 219.2, angle = -56deg'
3381+
)
33723382
return true
33733383
},
33743384
{ timeout: 10_000 }
@@ -3393,9 +3403,9 @@ profile001 = startProfile(sketch001, at = [106.68, 89.77])
33933403
extrude001 = extrude(profile001, length = 500)
33943404
sketch002 = startSketchOn(extrude001, face = seg01)
33953405
profile002 = startProfile(sketch002, at = [83.39, 329.15])
3396-
|> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
3397-
|> angledLine(length = 219.2, angle = -56)
3398-
|> angledLine(angle = -151, length = 116.27)
3406+
|> angledLine(angle = 0deg, length = 119.61, tag = $rectangleSegmentA001)
3407+
|> angledLine(length = 219.2, angle = -56deg)
3408+
|> angledLine(angle = -151deg, length = 116.27)
33993409
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
34003410
|> close()
34013411
profile003 = startProfile(sketch002, at = [-201.08, 254.17])
@@ -3432,10 +3442,10 @@ profile003 = startProfile(sketch002, at = [-201.08, 254.17])
34323442
extrude001 = extrude(profile001, length = 500)
34333443
sketch002 = startSketchOn(extrude001, face = seg01)
34343444
profile002 = startProfile(sketch002, at = [83.39, 329.15])
3435-
|> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
3436-
|> angledLine(length = 156.54, angle = -28)
3445+
|> angledLine(angle = 0deg, length = 119.61, tag = $rectangleSegmentA001)
3446+
|> angledLine(length = 156.54, angle = -28deg)
34373447
|> angledLine(
3438-
angle = -151,
3448+
angle = -151deg,
34393449
length = 116.27,
34403450
)
34413451
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])
@@ -3496,10 +3506,10 @@ profile003 = startProfile(sketch002, at = [-201.08, 254.17])
34963506
extrude001 = extrude(profile001, length = 500)
34973507
sketch002 = startSketchOn(extrude001, face = seg01)
34983508
profile002 = startProfile(sketch002, at = [83.39, 329.15])
3499-
|> angledLine(angle = 0, length = 119.61, tag = $rectangleSegmentA001)
3500-
|> angledLine(length = 156.54, angle = -28)
3509+
|> angledLine(angle = 0deg, length = 119.61, tag = $rectangleSegmentA001)
3510+
|> angledLine(length = 156.54, angle = -28deg)
35013511
|> angledLine(
3502-
angle = -151,
3512+
angle = -151deg,
35033513
length = 116.27,
35043514
)
35053515
|> line(endAbsolute = [profileStartX(%), profileStartY(%)])

‎e2e/playwright/snapshot-tests.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -845,14 +845,14 @@ test.describe('code color goober', { tag: '@snapshot' }, () => {
845845
sweepPath = startSketchOn(XZ)
846846
|> startProfile(at = [0.05, 0.05])
847847
|> line(end = [0, 7])
848-
|> tangentialArc(angle = 90, radius = 5)
848+
|> tangentialArc(angle = 90deg, radius = 5)
849849
|> line(end = [-3, 0])
850-
|> tangentialArc(angle = -90, radius = 5)
850+
|> tangentialArc(angle = -90deg, radius = 5)
851851
|> line(end = [0, 7])
852852
853853
sweepSketch = startSketchOn(XY)
854854
|> startProfile(at = [2, 0])
855-
|> arc(angleStart = 0, angleEnd = 360, radius = 2)
855+
|> arc(angleStart = 0, angleEnd = 360deg, radius = 2)
856856
|> sweep(path = sweepPath)
857857
|> appearance(
858858
color = "#bb00ff",
@@ -889,14 +889,14 @@ sweepSketch = startSketchOn(XY)
889889
sweepPath = startSketchOn(XZ)
890890
|> startProfile(at = [0.05, 0.05])
891891
|> line(end = [0, 7])
892-
|> tangentialArc(angle = 90, radius = 5)
892+
|> tangentialArc(angle = 90deg, radius = 5)
893893
|> line(end = [-3, 0])
894-
|> tangentialArc(angle = -90, radius = 5)
894+
|> tangentialArc(angle = -90deg, radius = 5)
895895
|> line(end = [0, 7])
896896
897897
sweepSketch = startSketchOn(XY)
898898
|> startProfile(at = [2, 0])
899-
|> arc(angleStart = 0, angleEnd = 360, radius = 2)
899+
|> arc(angleStart = 0deg, angleEnd = 360deg, radius = 2)
900900
|> sweep(path = sweepPath)
901901
|> appearance(
902902
color = '#bb00ff',
@@ -934,14 +934,14 @@ sweepSketch = startSketchOn(XY)
934934
sweepPath = startSketchOn(XZ)
935935
|> startProfile(at = [0.05, 0.05])
936936
|> line(end = [0, 7])
937-
|> tangentialArc(angle = 90, radius = 5)
937+
|> tangentialArc(angle = 90deg, radius = 5)
938938
|> line(end = [-3, 0])
939-
|> tangentialArc(angle = -90, radius = 5)
939+
|> tangentialArc(angle = -90deg, radius = 5)
940940
|> line(end = [0, 7])
941941
942942
sweepSketch = startSketchOn(XY)
943943
|> startProfile(at = [2, 0])
944-
|> arc(angleStart = 0, angleEnd = 360, radius = 2)
944+
|> arc(angleStart = 0deg, angleEnd = 360deg, radius = 2)
945945
|> sweep(path = sweepPath)
946946
|> appearance(
947947
color = "#bb00ff",

‎e2e/playwright/testing-constraints.spec.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ test.describe('Testing constraints', () => {
5757
.click()
5858

5959
await expect(page.locator('.cm-content')).toHaveText(
60-
`length001 = 20sketch001 = startSketchOn(XY) |> startProfile(at = [-10, -10]) |> line(end = [20, 0]) |> angledLine(angle = 90, length = length001) |> xLine(length = -20)`
60+
`length001 = 20sketch001 = startSketchOn(XY) |> startProfile(at = [-10, -10]) |> line(end = [20, 0]) |> angledLine(angle = 90deg, length = length001) |> xLine(length = -20)`
6161
)
6262

6363
// Make sure we didn't pop out of sketch mode.
@@ -208,7 +208,9 @@ test.describe('Testing constraints', () => {
208208
.click()
209209

210210
// Wait for the codemod to take effect
211-
await expect(page.locator('.cm-content')).toContainText(`angle = -57,`)
211+
await expect(page.locator('.cm-content')).toContainText(
212+
`angle = -57deg,`
213+
)
212214
await expect(page.locator('.cm-content')).toContainText(
213215
`offset = ${offset},`
214216
)
@@ -219,7 +221,7 @@ test.describe('Testing constraints', () => {
219221
`|> line(end = [74.36, 130.4], tag = $seg01)`
220222
)
221223
await expect(activeLinesContent[1]).toHaveText(
222-
` |> angledLineThatIntersects(angle = -57, offset = ${offset}, intersectTag = seg01)`
224+
` |> angledLineThatIntersects(angle = -57deg, offset = ${offset}, intersectTag = seg01)`
223225
)
224226

225227
// checking the count of the overlays is a good proxy check that the client sketch scene is in a good state
@@ -470,7 +472,7 @@ test.describe('Testing constraints', () => {
470472
testName: 'No variable',
471473
addVariable: false,
472474
axisSelect: false,
473-
value: 'segAng(seg01) + 22.69',
475+
value: 'segAng(seg01) + 22.69deg',
474476
},
475477
{
476478
testName: 'Add variable, selecting axis',
@@ -482,7 +484,7 @@ test.describe('Testing constraints', () => {
482484
testName: 'No variable, selecting axis',
483485
addVariable: false,
484486
axisSelect: true,
485-
value: 'turns::QUARTER_TURN - 7',
487+
value: 'turns::QUARTER_TURN - 7deg',
486488
},
487489
] as const
488490
for (const { testName, addVariable, value, axisSelect } of cases) {
@@ -585,7 +587,7 @@ test.describe('Testing constraints', () => {
585587
testName: 'Angle - No variable',
586588
addVariable: false,
587589
constraint: 'angle',
588-
value: '83, 78.33',
590+
value: '83deg, 78.33',
589591
},
590592
] as const
591593
for (const { testName, addVariable, value, constraint } of cases) {
@@ -657,13 +659,13 @@ test.describe('Testing constraints', () => {
657659
testName: 'Length - Add variable',
658660
addVariable: true,
659661
constraint: 'length',
660-
value: '83, length001',
662+
value: '83deg, length001',
661663
},
662664
{
663665
testName: 'Length - No variable',
664666
addVariable: false,
665667
constraint: 'length',
666-
value: '83, 78.33',
668+
value: '83deg, 78.33',
667669
},
668670
] as const
669671
for (const { testName, addVariable, value, constraint } of cases) {
@@ -852,7 +854,7 @@ part002 = startSketchOn(XZ)
852854
test.describe('Two segment - no modal constraints', () => {
853855
const cases = [
854856
{
855-
codeAfter: `|> angledLine(angle = 83, length = segLen(seg01))`,
857+
codeAfter: `|> angledLine(angle = 83deg, length = segLen(seg01))`,
856858
constraintName: 'Equal Length',
857859
},
858860
{
@@ -1174,7 +1176,7 @@ test.describe('Electron constraint tests', () => {
11741176
await cmdBar.progressCmdBar()
11751177
await editor.expectEditor.toContain('length001 = 15.3')
11761178
await editor.expectEditor.toContain(
1177-
'|> angledLine(angle = 9, length = length001)'
1179+
'|> angledLine(angle = 9deg, length = length001)'
11781180
)
11791181
})
11801182

‎rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer-no-pipeExpr.kcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@settings(defaultLengthUnit = in)
22
sketch001 = startSketchOn(XZ)
33
|> startProfile(at = [75.8, 317.2])
4-
|> angledLine(angle = 0, length = 268.43, tag = $rectangleSegmentA001)
5-
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 217.26, tag = $seg01)
4+
|> angledLine(angle = 0deg, length = 268.43, tag = $rectangleSegmentA001)
5+
|> angledLine(angle = segAng(rectangleSegmentA001) - 90deg, length = 217.26, tag = $seg01)
66
|> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $yo)
77
|> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
88
|> close()

‎rust/kcl-lib/e2e/executor/inputs/e2e-can-sketch-on-chamfer.kcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@settings(defaultLengthUnit = in)
22
sketch001 = startSketchOn(XZ)
33
|> startProfile(at = [75.8, 317.2]) // [$startCapTag, $EndCapTag]
4-
|> angledLine(angle = 0, length = 268.43, tag = $rectangleSegmentA001)
5-
|> angledLine(angle = segAng(rectangleSegmentA001) - 90, length = 217.26, tag = $seg01)
4+
|> angledLine(angle = 0deg, length = 268.43, tag = $rectangleSegmentA001)
5+
|> angledLine(angle = segAng(rectangleSegmentA001) - 90deg, length = 217.26, tag = $seg01)
66
|> angledLine(angle = segAng(rectangleSegmentA001), length = -segLen(rectangleSegmentA001), tag = $yo)
77
|> line(endAbsolute = [profileStartX(%), profileStartY(%)], tag = $seg02)
88
|> close()

‎rust/kcl-lib/src/execution/annotations.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use crate::{
1212
};
1313

1414
/// Annotations which should cause re-execution if they change.
15-
pub(super) const SIGNIFICANT_ATTRS: [&str; 2] = [SETTINGS, NO_PRELUDE];
15+
pub(super) const SIGNIFICANT_ATTRS: [&str; 3] = [SETTINGS, NO_PRELUDE, WARNINGS];
1616

1717
pub(crate) const SETTINGS: &str = "settings";
1818
pub(crate) const SETTINGS_UNIT_LENGTH: &str = "defaultLengthUnit";
@@ -162,7 +162,7 @@ pub(super) fn many_of(
162162
vec![source_range],
163163
))
164164
})
165-
.map(|v| *v)
165+
.copied()
166166
})
167167
.collect::<Result<Vec<&str>, KclError>>()
168168
}

0 commit comments

Comments
 (0)