Make ktlint happy

JetBrains · Jun 14, 2024 · 221c518 · 221c518
1 parent ede6945
commit 221c518
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 89 deletions.
diff --git a/foundation/api/foundation.api b/foundation/api/foundation.api
diff --git a/...src/main/kotlin/org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState.kt b/...src/main/kotlin/org/jetbrains/jewel/foundation/lazy/draggable/LazyLayoutDraggableState.kt
@@ -40,7 +40,7 @@ public abstract class LazyLayoutDraggableState<T> {
         val hoverItem = getReplacingItem(draggingItem)
 
         if (hoverItem != null && draggingItem.key != hoverItem.key) {
-            val targetOffset = if(draggingItem.index < hoverItem.index) {
+            val targetOffset = if (draggingItem.index < hoverItem.index) {
                 val maxOffset = hoverItem.offset + Offset(hoverItem.size.width, hoverItem.size.height)
                 maxOffset - Offset(draggingItem.size.width, draggingItem.size.height)
             } else {

diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableContent.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableContent.kt
@@ -2,7 +2,6 @@ package org.jetbrains.jewel.foundation.lazy.table
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntOffset
 
 public interface LazyTableContent {

diff --git a/...tion/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionScope.kt b/...tion/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableDimensionScope.kt
@@ -21,4 +21,4 @@ internal object LazyTableDimensionScopeImpl : LazyTableDimensionScope {
     override val noConstraints: Constraints = Constraints()
 
     override fun Any.with(constraints: Constraints): LazyTableDimensionDefinition = LazyTableDimensionDefinition(this, constraints)
-}
+}
diff --git a/...ion/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableIntervalContent.kt b/...ion/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableIntervalContent.kt
@@ -5,7 +5,6 @@ import androidx.compose.foundation.lazy.layout.MutableIntervalList
 import androidx.compose.foundation.lazy.layout.getDefaultLazyLayoutKey
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntOffset
 
 internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableCells) : LazyTableScope, LazyTableContent {
@@ -23,7 +22,8 @@ internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableC
         get() = rowIntervals.size
 
     override fun columnDefinitions(
-        count: Int, key: ((index: Int) -> Any)?,
+        count: Int,
+        key: ((index: Int) -> Any)?,
         constraints: (LazyTableLayoutScope.(index: Int) -> Constraints)?,
     ) {
         columnIntervals.addInterval(count, LazyTableDimensionInterval(key, constraints))
@@ -35,12 +35,13 @@ internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableC
             LazyTableDimensionInterval(
                 key = if (key != null) { _: Int -> key } else null,
                 constraints = if (constraints != null) { _: Int -> constraints() } else null,
-            )
+            ),
         )
     }
 
     override fun rowDefinitions(
-        count: Int, key: ((index: Int) -> Any)?,
+        count: Int,
+        key: ((index: Int) -> Any)?,
         constraints: (LazyTableLayoutScope.(index: Int) -> Constraints)?,
     ) {
         rowIntervals.addInterval(count, LazyTableDimensionInterval(key, constraints))
@@ -52,7 +53,7 @@ internal class LazyTableIntervalContent(content: LazyTableScope.() -> LazyTableC
             LazyTableDimensionInterval(
                 key = if (key != null) { _: Int -> key } else null,
                 constraints = if (constraints != null) { _: Int -> constraints() } else null,
-            )
+            ),
         )
     }
 

diff --git a/...dation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableItemProvider.kt b/...dation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/LazyTableItemProvider.kt
@@ -9,7 +9,6 @@ import androidx.compose.runtime.referentialEqualityPolicy
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.unit.Constraints
-import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.IntOffset
 
 internal interface LazyTableItemProvider : LazyLayoutItemProvider {

diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/draggable/Draggable.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/table/draggable/Draggable.kt
@@ -1,5 +1,3 @@
 package org.jetbrains.jewel.foundation.lazy.table.draggable
 
-import androidx.compose.foundation.gestures.Orientation
-import androidx.compose.ui.Modifier
-import org.jetbrains.jewel.foundation.lazy.draggable.LazyLayoutDraggableState
+
diff --git a/...tandalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Tables.kt b/...tandalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/component/Tables.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
@@ -59,67 +58,67 @@ data class Order(
     @ColumnInfo(
         name = "ID",
         minWidth = 50,
-        order = 0
+        order = 0,
     )
     val id: Int,
     @ColumnInfo(
         name = "Transaction ID",
         minWidth = 120,
-        order = 1
+        order = 1,
     )
     val transactionId: String,
     @ColumnInfo(
         name = "User ID",
         minWidth = 120,
-        order = 2
+        order = 2,
     )
     val uid: String,
     @ColumnInfo(
         name = "User Name",
         minWidth = 120,
-        order = 3
+        order = 3,
     )
     val userName: String,
     @ColumnInfo(
         name = "Product ID",
         minWidth = 80,
-        order = 4
+        order = 4,
     )
     val productId: Int,
     @ColumnInfo(
         name = "Product Name",
         minWidth = 300,
-        order = 5
+        order = 5,
     )
     val productName: String,
     @ColumnInfo(
         name = "Price",
         minWidth = 80,
-        order = 6
+        order = 6,
     )
     val price: String,
     @ColumnInfo(
         name = "Shipping Address",
         minWidth = 400,
-        order = 8
+        order = 8,
     )
     val shippingAddress: String,
     @ColumnInfo(
         name = "Postal Code",
         minWidth = 120,
-        order = 7
+        order = 7,
     )
     val postalCode: String,
     @ColumnInfo(
         name = "Create Time",
         minWidth = 50,
-        order = 9
+        order = 9,
     )
     val createTime: Int,
     @ColumnInfo(
         name = "Update Time",
         minWidth = 50,
-        order = 10
+        order = 10,
     )
     val updateTime: Int,
 ) {
@@ -139,7 +138,7 @@ data class Order(
                 shippingAddress = faker.address.fullAddress(),
                 postalCode = faker.code.asin(),
                 createTime = 0,
-                updateTime = 0
+                updateTime = 0,
             )
         }
     }
@@ -285,7 +284,7 @@ fun Tables() {
                 val info = columns[it].findAnnotations<ColumnInfo>().firstOrNull()
                 Constraints(
                     minWidth = info?.minWidth?.takeIf { it >= 0 }?.dp?.roundToPx() ?: 0,
-                    maxWidth = info?.maxWidth?.takeIf { it >= 0 }?.dp?.roundToPx() ?: Constraints.Infinity
+                    maxWidth = info?.maxWidth?.takeIf { it >= 0 }?.dp?.roundToPx() ?: Constraints.Infinity,
                 )
             }
 
@@ -318,7 +317,7 @@ fun Tables() {
                     }
                     LazyTableHeader(
                         modifier = draggable,
-                        contentAlignment = Alignment.CenterStart
+                        contentAlignment = Alignment.CenterStart,
                     ) {
                         val info = column.findAnnotations<ColumnInfo>().firstOrNull()
                         Text(info?.name ?: column.name, Modifier.padding(horizontal = 4.dp), maxLines = 1)
@@ -346,13 +345,13 @@ fun Tables() {
 
                     LazyTableCell(
                         modifier = draggable,
-                        contentAlignment = Alignment.CenterEnd
+                        contentAlignment = Alignment.CenterEnd,
                     ) {
                         Text(
                             column.getter.call(data[rowKey as Int]).toString(),
                             Modifier.padding(horizontal = 4.dp),
                             overflow = TextOverflow.Ellipsis,
-                            maxLines = 1
+                            maxLines = 1,
                         )
                     }
                 }
-Original file line number
+Diff line change
@@ Expand Up @@
         override val noConstraints: Constraints = Constraints()
         override fun Any.with(constraints: Constraints): LazyTableDimensionDefinition = LazyTableDimensionDefinition(this, constraints)
-    }
+    }