Skip to content

Commit 8f5514d

Browse files
wenli-caiwenli-cai
committed
Fix compose lint violations
1 parent 13fa318 commit 8f5514d

File tree

5 files changed

+102
-108
lines changed

5 files changed

+102
-108
lines changed

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/App.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Box
44
import androidx.compose.runtime.Composable
55
import androidx.compose.runtime.LaunchedEffect
66
import androidx.compose.runtime.getValue
7+
import androidx.compose.runtime.mutableFloatStateOf
78
import androidx.compose.runtime.mutableIntStateOf
89
import androidx.compose.runtime.mutableStateOf
910
import androidx.compose.runtime.remember
@@ -81,7 +82,7 @@ public fun App(
8182

8283
internal class SandboxState {
8384
var offset by mutableStateOf(Offset.Zero)
84-
var scale by mutableStateOf(1f)
85+
var scale by mutableFloatStateOf(1f)
8586

8687
fun reset() {
8788
offset = Offset.Zero

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/model/Node.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ internal data class Node(
1919
) {
2020

2121
override fun toString(): String {
22-
return "Node(name='$name', parent='$parent', children=${children})"
22+
return "Node(name='$name', parent='$parent', children=$children)"
2323
}
2424

2525
override fun equals(other: Any?): Boolean {
@@ -34,7 +34,7 @@ internal data class Node(
3434
}
3535

3636
internal fun Node.addChild(child: Node): Node {
37-
return copy( children = this.children + child )
37+
return copy(children = this.children + child)
3838
}
3939

4040
internal fun Node.replaceChild(child: Node): Node {

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/JsonParser.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ internal suspend fun parseTrace(
4141
return ParseResult.Failure(e)
4242
}
4343

44-
val parsedTrace = parsedRenderPasses.map { renderPass -> getFrameFromRenderPass(renderPass)}
44+
val parsedTrace = parsedRenderPasses.map { renderPass -> getFrameFromRenderPass(renderPass) }
4545
val frameTrees = mutableListOf<Node>()
4646
parsedTrace.fold(parsedTrace[0]) { tree, frame ->
4747
val mergedTree = mergeFrameIntoMainTree(frame, tree)
@@ -104,7 +104,7 @@ private fun buildTree(node: Node, childrenByParent: Map<String, List<Node>>): No
104104
internal fun mergeFrameIntoMainTree(
105105
frame: Node,
106106
main: Node
107-
) : Node {
107+
): Node {
108108
if (frame.id != main.id) {
109109
throw IllegalArgumentException("Frame root ID does not match main tree root ID.")
110110
}

‎workflow-trace-viewer/src/jvmMain/kotlin/com/squareup/workflow1/traceviewer/util/SandboxBackground.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@ import androidx.compose.foundation.layout.Box
66
import androidx.compose.foundation.layout.fillMaxSize
77
import androidx.compose.foundation.layout.wrapContentSize
88
import androidx.compose.runtime.Composable
9-
import androidx.compose.runtime.getValue
10-
import androidx.compose.runtime.mutableFloatStateOf
11-
import androidx.compose.runtime.mutableStateOf
12-
import androidx.compose.runtime.remember
13-
import androidx.compose.runtime.setValue
149
import androidx.compose.ui.Alignment
1510
import androidx.compose.ui.Modifier
16-
import androidx.compose.ui.geometry.Offset
1711
import androidx.compose.ui.graphics.graphicsLayer
1812
import androidx.compose.ui.input.pointer.PointerEventType
1913
import androidx.compose.ui.input.pointer.pointerInput

‎workflow-trace-viewer/src/jvmTest/kotlin/com/squareup/workflow1/traceviewer/util/JsonParserTest.kt

Lines changed: 96 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -8,101 +8,100 @@ import kotlin.test.assertTrue
88

99
class JsonParserTest {
1010

11-
@Test
12-
fun `test mergeFrameIntoMainTree with new children`() {
13-
// Create main tree with one child
14-
val mainChild = createNode("child1", "root", "1")
15-
val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
16-
17-
// Create frame with a new child
18-
val frameChild1 = createNode("child1", "root", "1")
19-
val frameChild2 = createNode("child2", "root", "2")
20-
val frame = createNode("root", "root", "0", "0", listOf(frameChild1, frameChild2))
21-
22-
// Merge frame into main tree
23-
val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
24-
25-
// Verify results
26-
assertEquals(2, mergedTree.children.size)
27-
assertTrue(mergedTree.children.any { it.id == "1" })
28-
assertTrue(mergedTree.children.any { it.id == "2" })
29-
}
30-
31-
@Test
32-
fun `test mergeFrameIntoMainTree with nested children`() {
33-
// Create main tree with nested structure
34-
val nestedChild = createNode("nested1", "child1", "2")
35-
val mainChild = createNode("child1", "root", "1", "0", listOf(nestedChild))
36-
val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
37-
38-
// Create frame with new nested child
39-
val frameNestedChild1 = createNode("nested1", "child1", "2")
40-
val frameNestedChild2 = createNode("nested2", "child1", "3")
41-
val frameChild = createNode("child1", "root", "1", "0",
42-
mutableListOf(frameNestedChild1, frameNestedChild2))
43-
val frame = createNode("root", "root", "0", "0", listOf(frameChild))
44-
45-
// Merge frame into main tree
46-
val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
47-
48-
// Verify results
49-
assertEquals(1, mergedTree.children.size)
50-
val updatedChild = mergedTree.children.first()
51-
assertEquals(2, updatedChild.children.size)
52-
assertTrue(updatedChild.children.any { it.id == "2" })
53-
assertTrue(updatedChild.children.any { it.id == "3" })
54-
}
55-
56-
@Test
57-
fun `test mergeFrameIntoMainTree with empty main tree children`() {
58-
// Create empty main tree
59-
val mainTree = createNode("root", "root", "0")
60-
61-
// Create frame with children
62-
val frameChild = createNode("child1", "root", "1")
63-
val frame = createNode("root", "root", "0", "0", listOf(frameChild))
64-
65-
// Merge frame into main tree
66-
val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
67-
68-
// Verify results
69-
assertEquals(1, mergedTree.children.size)
70-
assertEquals("child1", mergedTree.children.first().name)
71-
}
72-
73-
@Test
74-
fun `test mergeFrameIntoMainTree with empty frame children`() {
75-
// Create main tree with children
76-
val mainChild = createNode("child1", "root", "1")
77-
val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
78-
79-
// Create empty frame
80-
val frame = createNode("root", "root", "0")
81-
82-
// Merge frame into main tree
83-
mergeFrameIntoMainTree(frame, mainTree)
84-
85-
// Verify results
86-
assertEquals(1, mainTree.children.size)
87-
assertEquals("child1", mainTree.children.first().name)
88-
}
89-
90-
private fun createNode(
91-
name: String,
92-
parent: String,
93-
id: String,
94-
parentId: String = "0",
95-
children: List<Node> = emptyList()
96-
): Node {
97-
return Node(
98-
name = name,
99-
id = id,
100-
parent = parent,
101-
parentId = parentId,
102-
props = "",
103-
state = "",
104-
rendering = "",
105-
children = children,
106-
)
107-
}
11+
@Test
12+
fun `test mergeFrameIntoMainTree with new children`() {
13+
// Create main tree with one child
14+
val mainChild = createNode("child1", "root", "1")
15+
val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
16+
17+
// Create frame with a new child
18+
val frameChild1 = createNode("child1", "root", "1")
19+
val frameChild2 = createNode("child2", "root", "2")
20+
val frame = createNode("root", "root", "0", "0", listOf(frameChild1, frameChild2))
21+
22+
// Merge frame into main tree
23+
val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
24+
25+
// Verify results
26+
assertEquals(2, mergedTree.children.size)
27+
assertTrue(mergedTree.children.any { it.id == "1" })
28+
assertTrue(mergedTree.children.any { it.id == "2" })
29+
}
30+
31+
@Test
32+
fun `test mergeFrameIntoMainTree with nested children`() {
33+
// Create main tree with nested structure
34+
val nestedChild = createNode("nested1", "child1", "2")
35+
val mainChild = createNode("child1", "root", "1", "0", listOf(nestedChild))
36+
val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
37+
38+
// Create frame with new nested child
39+
val frameNestedChild1 = createNode("nested1", "child1", "2")
40+
val frameNestedChild2 = createNode("nested2", "child1", "3")
41+
val frameChild = createNode("child1", "root", "1", "0", mutableListOf(frameNestedChild1, frameNestedChild2))
42+
val frame = createNode("root", "root", "0", "0", listOf(frameChild))
43+
44+
// Merge frame into main tree
45+
val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
46+
47+
// Verify results
48+
assertEquals(1, mergedTree.children.size)
49+
val updatedChild = mergedTree.children.first()
50+
assertEquals(2, updatedChild.children.size)
51+
assertTrue(updatedChild.children.any { it.id == "2" })
52+
assertTrue(updatedChild.children.any { it.id == "3" })
53+
}
54+
55+
@Test
56+
fun `test mergeFrameIntoMainTree with empty main tree children`() {
57+
// Create empty main tree
58+
val mainTree = createNode("root", "root", "0")
59+
60+
// Create frame with children
61+
val frameChild = createNode("child1", "root", "1")
62+
val frame = createNode("root", "root", "0", "0", listOf(frameChild))
63+
64+
// Merge frame into main tree
65+
val mergedTree = mergeFrameIntoMainTree(frame, mainTree)
66+
67+
// Verify results
68+
assertEquals(1, mergedTree.children.size)
69+
assertEquals("child1", mergedTree.children.first().name)
70+
}
71+
72+
@Test
73+
fun `test mergeFrameIntoMainTree with empty frame children`() {
74+
// Create main tree with children
75+
val mainChild = createNode("child1", "root", "1")
76+
val mainTree = createNode("root", "root", "0", "0", listOf(mainChild))
77+
78+
// Create empty frame
79+
val frame = createNode("root", "root", "0")
80+
81+
// Merge frame into main tree
82+
mergeFrameIntoMainTree(frame, mainTree)
83+
84+
// Verify results
85+
assertEquals(1, mainTree.children.size)
86+
assertEquals("child1", mainTree.children.first().name)
87+
}
88+
89+
private fun createNode(
90+
name: String,
91+
parent: String,
92+
id: String,
93+
parentId: String = "0",
94+
children: List<Node> = emptyList()
95+
): Node {
96+
return Node(
97+
name = name,
98+
id = id,
99+
parent = parent,
100+
parentId = parentId,
101+
props = "",
102+
state = "",
103+
rendering = "",
104+
children = children,
105+
)
106+
}
108107
}

0 commit comments

Comments
 (0)