Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle non-existing JBColor key #172

Merged
merged 2 commits into from
Oct 12, 2023
Merged

Handle non-existing JBColor key #172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8320167
Handle non-existing JBColor key
Walingar Oct 12, 2023
84e20d6
Fix linting
Walingar Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import androidx.compose.ui.unit.sp
import androidx.compose.ui.unit.takeOrElse
import com.intellij.openapi.diagnostic.Logger
import com.intellij.ui.JBColor
import com.intellij.ui.JBColor.marker
import com.intellij.ui.scale.JBUIScale.scale
import com.intellij.util.ui.JBDimension
import com.intellij.util.ui.JBFont
Expand Down Expand Up @@ -49,21 +50,15 @@ fun java.awt.Color.toComposeColor() = Color(

fun java.awt.Color?.toComposeColorOrUnspecified() = this?.toComposeColor() ?: Color.Unspecified

@Suppress("JavaIoSerializableObjectMustHaveReadResolve")
private object FallbackMarker : JBColor(0x00001, 0x00001) {

override fun toString() = "%%%%%%COLOR_NOT_FOUND_MARKER%%%%%%"

override fun equals(other: Any?) = other === this

override fun hashCode() = toString().hashCode()
}

@Suppress("UnstableApiUsage")
fun retrieveColorOrNull(key: String): Color? =
JBColor.namedColor(key, FallbackMarker)
.takeUnless { it.name == "NAMED_COLOR_FALLBACK_MARKER" || FallbackMarker == it }
?.toComposeColor()
try {
JBColor.namedColor(key, marker("JEWEL_JBCOLOR_MARKER")).toComposeColor()
} catch (_: AssertionError) {
// JBColor.marker will throw AssertionError on getRGB/any other color
// for now there is no way to handle non-existing key.
// The way should be introduced in platform
null
}

fun retrieveColorOrUnspecified(key: String): Color {
val color = retrieveColorOrNull(key)
Expand Down
Loading