Make ktlint happy

yfn020 · Dec 7, 2022 · c0fdf6d · c0fdf6d
1 parent 6b9a843
commit c0fdf6d
Show file tree

Hide file tree

Showing 25 changed files with 726 additions and 570 deletions.
diff --git a/...alone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/ActionButton.kt b/...alone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/ActionButton.kt
@@ -1,4 +1,5 @@
 @file:Suppress("MatchingDeclarationName")
+
 package org.jetbrains.jewel.themes.expui.standalone.control
 
 import androidx.compose.foundation.Indication
@@ -32,7 +33,7 @@ class ActionButtonColors(
  override val normalAreaColors: AreaColors,
  override val hoverAreaColors: AreaColors,
  override val pressedAreaColors: AreaColors,
- override val disabledAreaColors: AreaColors,
+ override val disabledAreaColors: AreaColors
 ) : AreaProvider, HoverAreaProvider, PressedAreaProvider, DisabledAreaProvider {
 
  @Composable
@@ -61,7 +62,7 @@ fun ActionButton(
  indication: Indication? = HoverOrPressedIndication(shape),
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
  colors: ActionButtonColors = LocalActionButtonColors.current,
- content: @Composable BoxScope.() -> Unit,
+ content: @Composable BoxScope.() -> Unit
 ) {
  colors.provideArea(enabled) {
  Box(

diff --git a/...-standalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/Button.kt b/...-standalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/Button.kt
@@ -1,4 +1,5 @@
 @file:Suppress("MatchingDeclarationName")
+
 package org.jetbrains.jewel.themes.expui.standalone.control
 
 import androidx.compose.foundation.clickable
@@ -36,7 +37,7 @@ import org.jetbrains.jewel.themes.expui.standalone.theme.LightTheme
 class ButtonColors(
  override val normalAreaColors: AreaColors,
  override val focusAreaColors: AreaColors,
- override val disabledAreaColors: AreaColors,
+ override val disabledAreaColors: AreaColors
 ) : AreaProvider, FocusAreaProvider, DisabledAreaProvider {
 
  @Composable
@@ -72,7 +73,7 @@ fun OutlineButton(
  enabled: Boolean = true,
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
  colors: ButtonColors = LocalOutlineButtonColors.current,
- content: @Composable RowScope.() -> Unit,
+ content: @Composable RowScope.() -> Unit
 ) {
  ButtonImpl(onClick, modifier, enabled, interactionSource, colors, content)
 }
@@ -84,7 +85,7 @@ fun PrimaryButton(
  enabled: Boolean = true,
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
  colors: ButtonColors = LocalPrimaryButtonColors.current,
- content: @Composable RowScope.() -> Unit,
+ content: @Composable RowScope.() -> Unit
 ) {
  ButtonImpl(onClick, modifier, enabled, interactionSource, colors, content)
 }
@@ -96,7 +97,7 @@ private fun ButtonImpl(
  enabled: Boolean = true,
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
  colors: ButtonColors,
- content: @Composable RowScope.() -> Unit,
+ content: @Composable RowScope.() -> Unit
 ) {
  val isFocused = remember { mutableStateOf(false) }
  colors.provideArea(enabled, isFocused.value) {

diff --git a/...tandalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/CheckBox.kt b/...tandalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/CheckBox.kt
@@ -1,4 +1,5 @@
 @file:Suppress("MatchingDeclarationName")
+
 package org.jetbrains.jewel.themes.expui.standalone.control
 
 import androidx.compose.foundation.Canvas
@@ -47,7 +48,7 @@ class CheckBoxColors(
  override val normalAreaColors: AreaColors,
  override val selectionAreaColors: AreaColors,
  override val focusAreaColors: AreaColors,
- override val disabledAreaColors: AreaColors,
+ override val disabledAreaColors: AreaColors
 ) : AreaProvider, DisabledAreaProvider, FocusAreaProvider, SelectionAreaProvider {
 
  @Composable
@@ -81,7 +82,7 @@ fun Checkbox(
  modifier: Modifier = Modifier,
  enabled: Boolean = true,
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
- colors: CheckBoxColors = LocalCheckBoxColors.current,
+ colors: CheckBoxColors = LocalCheckBoxColors.current
 ) {
  TriStateCheckbox(
  state = ToggleableState(checked),
@@ -101,7 +102,7 @@ fun Checkbox(
  enabled: Boolean = true,
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
  colors: CheckBoxColors = LocalCheckBoxColors.current,
- content: @Composable () -> Unit,
+ content: @Composable () -> Unit
 ) {
  TriStateCheckbox(
  state = ToggleableState(checked),
@@ -121,12 +122,13 @@ fun TriStateCheckbox(
  modifier: Modifier = Modifier,
  enabled: Boolean = true,
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
- colors: CheckBoxColors = LocalCheckBoxColors.current,
+ colors: CheckBoxColors = LocalCheckBoxColors.current
 ) {
  val isFocused = remember { mutableStateOf(false) }
  colors.provideArea(enabled, isFocused.value, state != ToggleableState.Off) {
  CheckboxImpl(
- isFocused = isFocused.value, value = state,
+ isFocused = isFocused.value,
+ value = state,
  modifier = Modifier.onFocusEvent {
  isFocused.value = it.isFocused
  }.triStateToggleable(
@@ -149,7 +151,7 @@ fun TriStateCheckbox(
  enabled: Boolean = true,
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
  colors: CheckBoxColors = LocalCheckBoxColors.current,
- content: @Composable () -> Unit,
+ content: @Composable () -> Unit
 ) {
  val isFocused = remember { mutableStateOf(false) }
  colors.provideArea(enabled, isFocused.value, state != ToggleableState.Off) {
@@ -164,7 +166,8 @@ fun TriStateCheckbox(
  interactionSource = interactionSource,
  indication = null
  ),
- verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)
+ verticalAlignment = Alignment.CenterVertically,
+ horizontalArrangement = Arrangement.spacedBy(4.dp)
  ) {
  CheckboxImpl(isFocused = isFocused.value, value = state)
  content()
@@ -174,7 +177,11 @@ fun TriStateCheckbox(
 
 @Suppress("MagicNumber")
 private fun Checkmark() = ImageVector.Builder(
- name = "Checkmark", defaultWidth = 14.0.dp, defaultHeight = 14.0.dp, viewportWidth = 14.0f, viewportHeight = 14.0f
+ name = "Checkmark",
+ defaultWidth = 14.0.dp,
+ defaultHeight = 14.0.dp,
+ viewportWidth = 14.0f,
+ viewportHeight = 14.0f
 ).apply {
  path(
  fill = SolidColor(Color(0xFFffffff)),
@@ -234,7 +241,7 @@ private fun CheckmarkIndeterminate() = ImageVector.Builder(
 private fun CheckboxImpl(
  isFocused: Boolean,
  value: ToggleableState,
- modifier: Modifier = Modifier,
+ modifier: Modifier = Modifier
 ) {
  val icon = when (value) {
  ToggleableState.On -> rememberVectorPainter(Checkmark())

diff --git a/...tandalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/ComboBox.kt b/...tandalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/ComboBox.kt
@@ -1,4 +1,5 @@
 @file:Suppress("MatchingDeclarationName")
+
 package org.jetbrains.jewel.themes.expui.standalone.control
 
 import androidx.compose.foundation.clickable
@@ -40,7 +41,7 @@ class ComboBoxColors(
  override val normalAreaColors: AreaColors,
  override val focusAreaColors: AreaColors,
  override val disabledAreaColors: AreaColors,
- val dropdownMenuColors: DropdownMenuColors,
+ val dropdownMenuColors: DropdownMenuColors
 ) : AreaProvider, FocusAreaProvider, DisabledAreaProvider {
 
  @Composable
@@ -76,7 +77,7 @@ fun <T> ComboBox(
  enabled: Boolean = true,
  valueRender: @Composable (T) -> Unit = { Label("$it") },
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
- colors: ComboBoxColors = LocalComboBoxColors.current,
+ colors: ComboBoxColors = LocalComboBoxColors.current
 ) {
  val isFocused = remember { mutableStateOf(false) }
  var menuOpened by remember { mutableStateOf(false) }
@@ -105,9 +106,13 @@ fun <T> ComboBox(
  }.onFocusEvent {
  isFocused.value = it.isFocused
  }.clickable(
- interactionSource = interactionSource, indication = null, enabled = enabled, onClick = {
- menuOpened = true
- }, role = Role.Button
+ interactionSource = interactionSource,
+ indication = null,
+ enabled = enabled,
+ onClick = {
+ menuOpened = true
+ },
+ role = Role.Button
  ).padding(6.dp, 3.dp).then(modifier),
  contentAlignment = Alignment.CenterStart
  ) {

diff --git a/...dalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/ContextMenu.kt b/...dalone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/ContextMenu.kt
@@ -70,7 +70,7 @@ class ContextMenuColors(
  override val normalAreaColors: AreaColors,
  override val hoverAreaColors: AreaColors,
  override val pressedAreaColors: AreaColors,
- override val focusAreaColors: AreaColors,
+ override val focusAreaColors: AreaColors
 ) : AreaProvider, HoverAreaProvider, PressedAreaProvider, FocusAreaProvider {
 
  @Composable
@@ -99,7 +99,7 @@ class JbContextMenuRepresentation(private val colors: ContextMenuColors) : Conte
  isOpen = isOpen,
  items = items,
  onDismissRequest = { state.status = ContextMenuState.Status.Closed },
- colors = colors,
+ colors = colors
  )
  }
 }
@@ -110,7 +110,7 @@ fun ContextMenu(
  isOpen: Boolean,
  items: () -> List<ContextMenuItem>,
  onDismissRequest: () -> Unit,
- colors: ContextMenuColors = LocalContextMenuColors.current,
+ colors: ContextMenuColors = LocalContextMenuColors.current
 ) {
  if (isOpen) {
  var focusManager: FocusManager? by mutableStateOf(null)
@@ -144,7 +144,7 @@ fun ContextMenu(
  } else {
  false
  }
- },
+ }
  ) {
  focusManager = LocalFocusManager.current
  inputModeManager = LocalInputModeManager.current
@@ -185,7 +185,7 @@ private fun MenuItemContent(
  contentPadding: PaddingValues = PaddingValues(horizontal = 8.dp),
  shape: Shape = RoundedCornerShape(3.dp),
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
- content: @Composable RowScope.() -> Unit,
+ content: @Composable RowScope.() -> Unit
 ) {
  val focused = remember { mutableStateOf(false) }
  val focusedColors = LocalFocusAreaColors.current

diff --git a/...alone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/DropdownMenu.kt b/...alone/src/main/kotlin/org/jetbrains/jewel/themes/expui/standalone/control/DropdownMenu.kt
@@ -81,7 +81,7 @@ class DropdownMenuColors(
  override val normalAreaColors: AreaColors,
  override val hoverAreaColors: AreaColors,
  override val pressedAreaColors: AreaColors,
- override val focusAreaColors: AreaColors,
+ override val focusAreaColors: AreaColors
 ) : AreaProvider, HoverAreaProvider, PressedAreaProvider, FocusAreaProvider {
 
  @Composable
@@ -109,7 +109,7 @@ fun DropdownMenu(
  modifier: Modifier = Modifier,
  offset: DpOffset = DpOffset(0.dp, 0.dp),
  colors: DropdownMenuColors = LocalDropdownMenuColors.current,
- content: @Composable ColumnScope.() -> Unit,
+ content: @Composable ColumnScope.() -> Unit
 ) {
  val expandedStates = remember { MutableTransitionState(false) }
  expandedStates.targetState = expanded
@@ -122,7 +122,8 @@ fun DropdownMenu(
  // avoid content being cut off if the [DropdownMenu] contains too many items.
  // See: https://github.com/JetBrains/compose-jb/issues/1388
  val popupPositionProvider = DesktopDropdownMenuPositionProvider(
- offset, density
+ offset,
+ density
  ) { parentBounds, menuBounds ->
  transformOriginState.value = calculateTransformOrigin(parentBounds, menuBounds)
  }
@@ -135,13 +136,15 @@ fun DropdownMenu(
  popupPositionProvider = popupPositionProvider,
  onKeyEvent = {
  handlePopupOnKeyEvent(it, onDismissRequest, focusManager!!, inputModeManager!!)
- },
+ }
  ) {
  focusManager = LocalFocusManager.current
  inputModeManager = LocalInputModeManager.current
 
  DropdownMenuContent(
- modifier = modifier, colors = colors, content = content
+ modifier = modifier,
+ colors = colors,
+ content = content
  )
  }
  }
@@ -155,7 +158,7 @@ fun DropdownMenuItem(
  shape: Shape = RectangleShape,
  contentPadding: PaddingValues = PaddingValues(horizontal = 8.dp),
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
- content: @Composable RowScope.() -> Unit,
+ content: @Composable RowScope.() -> Unit
 ) {
  DropdownMenuItemContent(
  onClick = onClick,
@@ -173,7 +176,7 @@ private fun handlePopupOnKeyEvent(
  keyEvent: androidx.compose.ui.input.key.KeyEvent,
  onDismissRequest: () -> Unit,
  focusManager: FocusManager,
- inputModeManager: InputModeManager,
+ inputModeManager: InputModeManager
 ): Boolean {
  return if (keyEvent.type == KeyEventType.KeyDown && keyEvent.awtEventOrNull?.keyCode == KeyEvent.VK_ESCAPE) {
  onDismissRequest()
@@ -206,7 +209,7 @@ fun CursorDropdownMenu(
  focusable: Boolean = true,
  modifier: Modifier = Modifier,
  colors: DropdownMenuColors = LocalDropdownMenuColors.current,
- content: @Composable ColumnScope.() -> Unit,
+ content: @Composable ColumnScope.() -> Unit
 ) {
  val expandedStates = remember { MutableTransitionState(false) }
  expandedStates.targetState = expanded
@@ -221,13 +224,15 @@ fun CursorDropdownMenu(
  popupPositionProvider = rememberCursorPositionProvider(),
  onKeyEvent = {
  handlePopupOnKeyEvent(it, onDismissRequest, focusManager!!, inputModeManager!!)
- },
+ }
  ) {
  focusManager = LocalFocusManager.current
  inputModeManager = LocalInputModeManager.current
 
  DropdownMenuContent(
- modifier = modifier, colors = colors, content = content
+ modifier = modifier,
+ colors = colors,
+ content = content
  )
  }
  }
@@ -237,14 +242,14 @@ fun CursorDropdownMenu(
 internal data class DesktopDropdownMenuPositionProvider(
  val contentOffset: DpOffset,
  val density: Density,
- val onPositionCalculated: (IntRect, IntRect) -> Unit = { _, _ -> },
+ val onPositionCalculated: (IntRect, IntRect) -> Unit = { _, _ -> }
 ) : PopupPositionProvider {
 
  override fun calculatePosition(
  anchorBounds: IntRect,
  windowSize: IntSize,
  layoutDirection: LayoutDirection,
- popupContentSize: IntSize,
+ popupContentSize: IntSize
  ): IntOffset {
  // The min margin above and below the menu, relative to the screen.
  val verticalMargin = with(density) { MenuVerticalMargin.roundToPx() }
@@ -289,7 +294,8 @@ internal data class DesktopDropdownMenuPositionProvider(
  y = y.coerceAtLeast(0)
 
  onPositionCalculated(
- anchorBounds, IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
+ anchorBounds,
+ IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
  )
  return IntOffset(x, y)
  }
@@ -299,7 +305,7 @@ internal data class DesktopDropdownMenuPositionProvider(
 internal fun DropdownMenuContent(
  modifier: Modifier = Modifier,
  colors: DropdownMenuColors = LocalDropdownMenuColors.current,
- content: @Composable ColumnScope.() -> Unit,
+ content: @Composable ColumnScope.() -> Unit
 ) {
  colors.provideArea {
  val scrollState = rememberScrollState()
@@ -311,7 +317,8 @@ internal fun DropdownMenuContent(
  .width(IntrinsicSize.Max)
  ) {
  Column(
- modifier = Modifier.verticalScroll(scrollState), content = content
+ modifier = Modifier.verticalScroll(scrollState),
+ content = content
  )
  Box(modifier = Modifier.matchParentSize()) {
  VerticalScrollbar(
@@ -331,7 +338,7 @@ internal fun DropdownMenuItemContent(
  shape: Shape = RectangleShape,
  contentPadding: PaddingValues = PaddingValues(horizontal = 8.dp),
  interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
- content: @Composable RowScope.() -> Unit,
+ content: @Composable RowScope.() -> Unit
 ) {
  val focused = remember { mutableStateOf(false) }
  val focusedColors = LocalFocusAreaColors.current
@@ -359,7 +366,7 @@ internal fun DropdownMenuItemContent(
 
 internal fun calculateTransformOrigin(
  parentBounds: IntRect,
- menuBounds: IntRect,
+ menuBounds: IntRect
 ): TransformOrigin {
  val pivotX = when {
  menuBounds.left >= parentBounds.right -> 0f