[JEWEL-818] Make LaF Parsing More Defensive Against Bad Themes

DanielSouzaBertoldi · DanielSouzaBertoldi · commit 50bc558309d4 · 2025-06-03T11:19:34.000-03:00
This commit also refactors some minor stuff throughout the code
diff --git a/platform/jewel/ide-laf-bridge/api/ide-laf-bridge.api b/platform/jewel/ide-laf-bridge/api/ide-laf-bridge.api
@@ -41,6 +41,10 @@ public final class org/jetbrains/jewel/bridge/BridgeUtilsKt {
 	public static synthetic fun retrieveTextStyle-WdJyH8Q$default (Ljava/lang/String;JJZIJILjava/lang/Object;)Landroidx/compose/ui/text/TextStyle;
 	public static final fun retrieveTextStyle-tD9LlGs (Ljava/lang/String;Ljava/lang/String;JZIJ)Landroidx/compose/ui/text/TextStyle;
 	public static synthetic fun retrieveTextStyle-tD9LlGs$default (Ljava/lang/String;Ljava/lang/String;JZIJILjava/lang/Object;)Landroidx/compose/ui/text/TextStyle;
+	public static final fun safeValue (II)I
+	public static synthetic fun safeValue$default (IIILjava/lang/Object;)I
+	public static final fun safeValue-YgX7TsA (FF)F
+	public static synthetic fun safeValue-YgX7TsA$default (FFILjava/lang/Object;)F
 	public static final fun toAwtColor-8_81llA (J)Ljava/awt/Color;
 	public static final fun toComposeColor (Ljava/awt/Color;)J
 	public static final fun toComposeColorOrUnspecified (Ljava/awt/Color;)J
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt
@@ -40,10 +40,10 @@ import com.intellij.util.ui.JBDimension
 import com.intellij.util.ui.JBFont
 import com.intellij.util.ui.JBInsets
 import com.intellij.util.ui.JBValue
-import org.jetbrains.jewel.ui.component.Typography
 import java.awt.Dimension
 import java.awt.Insets
 import javax.swing.UIManager
+import org.jetbrains.jewel.ui.component.Typography
 
 private val logger = Logger.getInstance("JewelBridge")
 
@@ -54,6 +54,7 @@ public fun Color.toAwtColor(): java.awt.Color = java.awt.Color(red, green, blue,
 public fun java.awt.Color?.toComposeColorOrUnspecified(): Color = this?.toComposeColor() ?: Color.Unspecified
 
 public fun Dp.safeValue(minimumValue: Dp = 0.dp) = this.coerceAtLeast(minimumValue)
+
 public fun Int.safeValue(minimumValue: Int = 0) = this.coerceAtLeast(minimumValue)
 
 public fun retrieveColor(key: String, default: Color): Color = retrieveColorOrNull(key) ?: default
@@ -117,7 +118,7 @@ public fun Insets.toPaddingValues(): PaddingValues =
             start = left.dp.safeValue(),
             top = top.dp.safeValue(),
             end = right.dp.safeValue(),
-            bottom = bottom.dp.safeValue()
+            bottom = bottom.dp.safeValue(),
         )
     }
 
@@ -131,32 +132,27 @@ public fun JBInsets.toPaddingValues(): PaddingValues =
         start = unscaled.left.dp.safeValue(),
         top = unscaled.top.dp.safeValue(),
         end = unscaled.right.dp.safeValue(),
-        bottom = unscaled.bottom.dp.safeValue()
+        bottom = unscaled.bottom.dp.safeValue(),
     )
 
 /**
  * Converts a [Dimension] to [DpSize]. If the receiver is a [JBDimension] instance, this function delegates to the
  * specific [toDpSize] for it, which is scaling-aware.
  */
-public fun Dimension.toDpSize(): DpSize = if (this is JBDimension) {
-    toDpSize()
-} else {
-    DpSize(
-        width = width.dp.safeValue(),
-        height = height.dp.safeValue()
-    )
-}
+public fun Dimension.toDpSize(): DpSize =
+    if (this is JBDimension) {
+        toDpSize()
+    } else {
+        DpSize(width = width.dp.safeValue(), height = height.dp.safeValue())
+    }
 
 /**
  * Converts a [JBDimension] to [DpSize], in a scaling-aware way. This means that the resulting [DpSize] will be
  * constructed by first obtaining the unscaled values. This avoids double scaling.
  */
 public fun JBDimension.toDpSize(): DpSize {
     val scaleFactor = scale(1f)
-    return DpSize(
-        width = (width2d() / scaleFactor).dp.safeValue(),
-        height = (height2d() / scaleFactor).dp.safeValue()
-    )
+    return DpSize(width = (width2d() / scaleFactor).dp.safeValue(), height = (height2d() / scaleFactor).dp.safeValue())
 }
 
 public fun retrieveArcAsCornerSize(key: String): CornerSize = CornerSize(retrieveIntAsDp(key) / 2)
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt
@@ -5,6 +5,7 @@ import androidx.compose.ui.text.TextStyle
 import com.intellij.ide.ui.laf.darcula.DarculaUIUtil
 import com.intellij.ui.JBColor
 import com.intellij.util.ui.DirProvider
+import javax.swing.UIManager
 import org.jetbrains.jewel.bridge.dp
 import org.jetbrains.jewel.bridge.lafName
 import org.jetbrains.jewel.bridge.readFromLaF
@@ -18,7 +19,6 @@ import org.jetbrains.jewel.foundation.theme.ThemeIconData
 import org.jetbrains.jewel.foundation.util.JewelLogger
 import org.jetbrains.jewel.ui.ComponentStyling
 import org.jetbrains.jewel.ui.DefaultComponentStyling
-import javax.swing.UIManager
 
 private val logger = JewelLogger.getInstance("JewelIntUiBridge")
 
@@ -102,6 +102,4 @@ internal fun createBridgeComponentStyling(theme: ThemeDefinition): ComponentStyl
 }
 
 internal val componentArc: CornerSize
-    get() = CornerSize(
-        size = DarculaUIUtil.COMPONENT_ARC.dp.safeValue() / 2
-    )
+    get() = CornerSize(size = DarculaUIUtil.COMPONENT_ARC.dp.safeValue() / 2)
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeDropdown.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeDropdown.kt
@@ -104,9 +104,7 @@ internal fun readUndecoratedDropdownStyle(menuStyle: MenuStyle): DropdownStyle {
             DropdownMetrics(
                 arrowMinSize = DpSize(arrowWidth, minimumSize.height),
                 minSize = DpSize(minimumSize.width + arrowWidth, minimumSize.height),
-                cornerSize = CornerSize(
-                    size = JBUI.CurrentTheme.MainToolbar.Dropdown.hoverArc().dp.safeValue(),
-                ),
+                cornerSize = CornerSize(size = JBUI.CurrentTheme.MainToolbar.Dropdown.hoverArc().dp.safeValue()),
                 contentPadding = PaddingValues(3.dp), // from
                 // com.intellij.ide.ui.laf.darcula.ui.DarculaComboBoxUI.getDefaultComboBoxInsets
                 borderWidth = 0.dp,
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeMenu.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeMenu.kt
@@ -76,9 +76,7 @@ internal fun readMenuStyle(): MenuStyle {
                 contentPadding = PaddingValues(vertical = 7.dp, horizontal = 2.dp),
                 offset = DpOffset(0.dp, 2.dp),
                 shadowSize = 12.dp,
-                borderWidth = retrieveIntAsDpOrUnspecified("Popup.borderWidth")
-                    .takeOrElse { 1.dp }
-                    .coerceAtLeast(1.dp),
+                borderWidth = retrieveIntAsDpOrUnspecified("Popup.borderWidth").takeOrElse { 1.dp }.coerceAtLeast(1.dp),
                 itemMetrics =
                     MenuItemMetrics(
                         selectionCornerSize = CornerSize(JBUI.CurrentTheme.PopupMenu.Selection.ARC.dp.safeValue() / 2),
@@ -96,15 +94,17 @@ internal fun readMenuStyle(): MenuStyle {
                             retrieveIntAsDpOrUnspecified("PopupMenuSeparator.stripeWidth")
                                 .takeOrElse { 1.dp }
                                 .coerceAtLeast(1.dp),
-                        separatorHeight = retrieveIntAsDpOrUnspecified("PopupMenuSeparator.height")
-                            .takeOrElse { 3.dp }
-                            .coerceAtLeast(3.dp),
+                        separatorHeight =
+                            retrieveIntAsDpOrUnspecified("PopupMenuSeparator.height")
+                                .takeOrElse { 3.dp }
+                                .coerceAtLeast(3.dp),
                         iconSize = 16.dp,
-                        minHeight = if (isNewUiTheme()) {
-                            JBUI.CurrentTheme.List.rowHeight().dp
-                        } else {
-                            Dp.Unspecified
-                        },
+                        minHeight =
+                            if (isNewUiTheme()) {
+                                JBUI.CurrentTheme.List.rowHeight().dp
+                            } else {
+                                Dp.Unspecified
+                            },
                     ),
                 submenuMetrics = SubmenuMetrics(offset = DpOffset(0.dp, (-8).dp)),
             ),
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeScrollbar.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeScrollbar.kt
@@ -9,6 +9,8 @@ import com.intellij.diagnostic.LoadingState
 import com.intellij.ide.ui.UISettings
 import com.intellij.openapi.util.registry.Registry.Companion.intValue
 import com.intellij.ui.ColorUtil
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 import org.jetbrains.jewel.bridge.ScrollbarHelper
 import org.jetbrains.jewel.bridge.retrieveColor
 import org.jetbrains.jewel.bridge.toAwtColor
@@ -19,8 +21,6 @@ import org.jetbrains.jewel.ui.component.styling.ScrollbarStyle
 import org.jetbrains.jewel.ui.component.styling.ScrollbarVisibility
 import org.jetbrains.jewel.ui.component.styling.TrackClickBehavior
 import org.jetbrains.skiko.hostOs
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
 
 private val useContrastScrollbars: Boolean
     get() = LoadingState.CONFIGURATION_STORE_INITIALIZED.isOccurred && UISettings.getInstance().useContrastScrollbars
@@ -240,11 +240,12 @@ private fun Color.updateTransparency(isDark: Boolean): Color {
     if (!useContrastScrollbars) return this
 
     var alpha = intValue("contrast.scrollbars.alpha.level")
-    alpha = if (alpha > 0) {
-        Integer.min(alpha, 255)
-    } else {
-        if (!isDark) LIGHT_ALPHA else DARK_ALPHA
-    }
+    alpha =
+        if (alpha > 0) {
+            Integer.min(alpha, 255)
+        } else {
+            if (!isDark) LIGHT_ALPHA else DARK_ALPHA
+        }
     return ColorUtil.toAlpha(this.toAwtColor(), alpha).toComposeColor()
 }
 
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeSimpleListItem.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridgeSimpleListItem.kt
@@ -28,7 +28,8 @@ internal fun readSimpleListItemStyle() =
             SimpleListItemMetrics(
                 innerPadding = JBUI.CurrentTheme.PopupMenu.Selection.innerInsets().toPaddingValues(),
                 outerPadding = JBUI.CurrentTheme.PopupMenu.Selection.outerInsets().toPaddingValues(),
-                selectionBackgroundCornerSize = CornerSize(JBUI.CurrentTheme.PopupMenu.Selection.ARC.dp.safeValue() / 2),
+                selectionBackgroundCornerSize =
+                    CornerSize(JBUI.CurrentTheme.PopupMenu.Selection.ARC.dp.safeValue() / 2),
                 iconTextGap = 2.dp,
             ),
     )
