Yet another round of cleanup

JetBrains · Nov 1, 2023 · c834e83 · c834e83
1 parent d9d1bb0
commit c834e83
Show file tree

Hide file tree

Showing 59 changed files with 714 additions and 936 deletions.
diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt
@@ -38,13 +38,11 @@ internal fun DecoratedWindowScope.TitleBarOnLinux(
     val viewConfig = LocalViewConfiguration.current
     TitleBarImpl(
         modifier.onPointerEvent(PointerEventType.Press, PointerEventPass.Main) {
-            if (
-                this.currentEvent.button == PointerButton.Primary &&
+            if (this.currentEvent.button == PointerButton.Primary &&
                 this.currentEvent.changes.any { changed -> !changed.isConsumed }
             ) {
                 JBR.getWindowMove()?.startMovingTogetherWithMouse(window, MouseEvent.BUTTON1)
-                if (
-                    System.currentTimeMillis() - lastPress in
+                if (System.currentTimeMillis() - lastPress in
                     viewConfig.doubleTapMinTimeMillis..viewConfig.doubleTapTimeoutMillis
                 ) {
                     if (state.isMaximized) {
@@ -97,7 +95,14 @@ private fun TitleBarScope.CloseButton(
     state: DecoratedWindowState,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,
 ) {
-    ControlButton(onClick, state, style.icons.closeButton, "Close", style, style.paneCloseButtonStyle)
+    ControlButton(
+        onClick,
+        state,
+        style.icons.closeButton,
+        "Close",
+        style,
+        style.paneCloseButtonStyle,
+    )
 }
 
 @Composable

diff --git a/...rated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt b/...rated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt
@@ -48,4 +48,6 @@ public class DecoratedWindowMetrics(public val borderWidth: Dp) {
 }
 
 public val LocalDecoratedWindowStyle: ProvidableCompositionLocal<DecoratedWindowStyle> =
-    staticCompositionLocalOf<DecoratedWindowStyle> { error("No DecoratedWindowStyle provided. Have you forgotten the theme?") }
+    staticCompositionLocalOf {
+        error("No DecoratedWindowStyle provided. Have you forgotten the theme?")
+    }
diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt
@@ -97,4 +97,6 @@ public class TitleBarIcons(
 }
 
 public val LocalTitleBarStyle: ProvidableCompositionLocal<TitleBarStyle> =
-    staticCompositionLocalOf<TitleBarStyle> { error("No TitleBarStyle provided. Have you forgotten the theme?") }
+    staticCompositionLocalOf {
+        error("No TitleBarStyle provided. Have you forgotten the theme?")
+    }
diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/Foundation.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/Foundation.kt
@@ -66,11 +66,12 @@ internal object Foundation {
         ID(myObjcMsgSend?.invokeLong(prepInvoke(id, selector, args)) ?: 0)
 
     /**
-     * Invokes the given vararg selector. Expects `NSArray arrayWithObjects:(id), ...` like signature,
-     * i.e. exactly one fixed argument, followed by varargs.
+     * Invokes the given vararg selector. Expects `NSArray arrayWithObjects:(id), ...` like signature, i.e.,
+     * exactly one fixed argument, followed by varargs.
      */
     public fun invokeVarArg(id: ID?, selector: Pointer?, vararg args: Any?): ID {
-        // c functions and objc methods have at least 1 fixed argument, we therefore need to separate
+        // c functions and objc methods have at least 1 fixed argument, we therefore need to
+        // separate
         // out the first argument
         return myFoundationLibrary?.objc_msgSend(
             id,

diff --git a/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/MacUtil.kt b/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/macos/MacUtil.kt
@@ -74,8 +74,7 @@ internal object MacUtil {
         SwingUtilities.invokeLater {
             val window = getWindowFromJavaWindow(w)
             val delegate = Foundation.invoke(window, "delegate")
-            if (
-                Foundation.invoke(
+            if (Foundation.invoke(
                     delegate,
                     "respondsToSelector:",
                     Foundation.createSelector("updateColors"),

diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt
@@ -42,4 +42,6 @@ public class OutlineColors(
 }
 
 public val LocalGlobalColors: ProvidableCompositionLocal<GlobalColors> =
-    staticCompositionLocalOf<GlobalColors> { error("No GlobalColors provided. Have you forgotten the theme?") }
+    staticCompositionLocalOf {
+        error("No GlobalColors provided. Have you forgotten the theme?")
+    }
diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalMetrics.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalMetrics.kt
@@ -16,4 +16,6 @@ public class GlobalMetrics(
 }
 
 public val LocalGlobalMetrics: ProvidableCompositionLocal<GlobalMetrics> =
-    staticCompositionLocalOf<GlobalMetrics> { error("No GlobalMetrics provided. Have you forgotten the theme?") }
+    staticCompositionLocalOf {
+        error("No GlobalMetrics provided. Have you forgotten the theme?")
+    }
diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt
@@ -38,7 +38,8 @@ public interface SelectableColumnOnKeyEvent {
             }
             if (list.isNotEmpty()) {
                 state.selectedKeys =
-                    state.selectedKeys.toMutableList().also { selectionList -> selectionList.addAll(list) }
+                    state.selectedKeys.toMutableList()
+                        .also { selectionList -> selectionList.addAll(list) }
             }
         }
     }
@@ -192,9 +193,9 @@ public interface SelectableColumnOnKeyEvent {
         val visibleSize = state.layoutInfo.visibleItemsInfo.size
         val targetIndex = min((state.lastActiveItemIndex ?: 0) + visibleSize, keys.lastIndex)
         val newSelectionList =
-            keys.subList(state.lastActiveItemIndex ?: 0, targetIndex).filterIsInstance<Selectable>().let {
-                state.selectedKeys + it.map { selectableKey -> selectableKey.key }
-            }
+            keys.subList(state.lastActiveItemIndex ?: 0, targetIndex)
+                .filterIsInstance<Selectable>()
+                .let { state.selectedKeys + it.map { selectableKey -> selectableKey.key } }
         state.selectedKeys = newSelectionList
         state.lastActiveItemIndex = targetIndex
     }

diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt
@@ -70,7 +70,8 @@ public fun SelectableLazyColumn(
             .onPreviewKeyEvent { event ->
                 if (state.lastActiveItemIndex != null) {
                     val actionHandled =
-                        keyActions.handleOnKeyEvent(event, keys, state, selectionMode).invoke(event)
+                        keyActions.handleOnKeyEvent(event, keys, state, selectionMode)
+                            .invoke(event)
                     if (actionHandled) {
                         scope.launch { state.lastActiveItemIndex?.let { state.scrollToItem(it) } }
                     }
@@ -120,6 +121,7 @@ public fun SelectableLazyColumn(
                     ) { index ->
                         val itemScope =
                             SelectableLazyItemScope(entry.key(index) in state.selectedKeys, isFocused)
+
                         if (keys.any { it.key == entry.key(index) && it is SelectableLazyListKey.Selectable }) {
                             Box(
                                 modifier =
@@ -142,6 +144,7 @@ public fun SelectableLazyColumn(
                 is Entry.StickyHeader ->
                     stickyHeader(entry.key, entry.contentType) {
                         val itemScope = SelectableLazyItemScope(entry.key in state.selectedKeys, isFocused)
+
                         if (keys.any { it.key == entry.key && it is SelectableLazyListKey.Selectable }) {
                             Box(
                                 modifier =
@@ -157,9 +160,8 @@ public fun SelectableLazyColumn(
                                 entry.content.invoke(itemScope)
                             }
                         } else {
-                            SelectableLazyItemScope(entry.key in state.selectedKeys, isFocused).apply {
-                                entry.content.invoke(itemScope)
-                            }
+                            SelectableLazyItemScope(entry.key in state.selectedKeys, isFocused)
+                                .apply { entry.content.invoke(itemScope) }
                         }
                     }
             }

diff --git a/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListScope.kt b/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListScope.kt
@@ -28,13 +28,14 @@ public interface SelectableLazyListScope {
      * Represents a list of items based on the provided parameters.
      *
      * @param count The number of items in the list.
-     * @param key A function that generates a unique key for each item based on its index.
-     * @param contentType A function that returns the content type of an item based on its index.
-     *   Defaults to `null`.
-     * @param selectable A function that determines if an item is selectable based on its index.
-     *   Defaults to `true`.
-     * @param itemContent The content of each individual item, specified as a composable function that
-     *   takes the item's index as a parameter.
+     * @param key A function that generates a unique key for each item based on
+     *     its index.
+     * @param contentType A function that returns the content type of an item
+     *     based on its index. Defaults to `null`.
+     * @param selectable A function that determines if an item is selectable
+     *     based on its index. Defaults to `true`.
+     * @param itemContent The content of each individual item, specified as a
+     *     composable function that takes the item's index as a parameter.
      */
     public fun items(
         count: Int,