Merge pull request #4 from ahankinson/upgrade-color

Upgrade the colormath plugin and other dependencies

Author: ahankinson

.github/workflows/build.yml

@@ -50,7 +50,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle
@@ -115,7 +115,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle
@@ -174,7 +174,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 17
+          java-version: 21
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
@@ -206,7 +206,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle

.github/workflows/release.yml

@@ -29,13 +29,11 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 17
+          java-version: 21
 
       # Setup Gradle
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-home-cache-cleanup: true
+        uses: gradle/actions/setup-gradle@v4
 
       # Set environment variables
       - name: Export Properties

.gitignore

@@ -10,3 +10,4 @@ testData/
 todos/
 src/main/gen
 .intellijPlatform/
+.DS_Store

build.gradle.kts

@@ -2,22 +2,24 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 
 fun properties(key: String) = project.findProperty(key).toString()
 
 plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.9.25"
+    id("org.jetbrains.kotlin.jvm") version "2.2.0"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij.platform") version "2.1.0"
+    id("org.jetbrains.intellij.platform") version "2.6.0"
     // GrammarKit Plugin
     id("org.jetbrains.grammarkit") version "2022.3.2.2"
     // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "1.3.1"
+    id("org.jetbrains.changelog") version "2.2.1"
     // Gradle Qodana Plugin
-    id("org.jetbrains.qodana") version "0.1.13"
+    id("org.jetbrains.qodana") version "2025.1.1"
 }
 
 group = properties("pluginGroup")
@@ -37,14 +39,14 @@ dependencies {
 
         plugins(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
 
-        instrumentationTools()
         pluginVerifier()
         testFramework(TestFrameworkType.Platform)
     }
 
-    implementation("com.github.ajalt.colormath:colormath:2.1.0")
+    implementation("com.github.ajalt.colormath:colormath:3.6.1")
 
-    testImplementation("org.jetbrains.kotlin:kotlin-test:1.9.25")
+    testImplementation("org.jetbrains.kotlin:kotlin-test:2.2.0")
+    implementation("org.opentest4j:opentest4j:1.3.0")
 }
 
 // Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
@@ -61,13 +63,23 @@ changelog {
 }
 
 // Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
+// Updating quodana marks these as red. I'm afraid I'm not familiar enough with how quodana works
+// to fix it.
+//
+// I did try updating to 2025.1.1 in the GH actions and it blew up if I updated it to the latest
+// version. So I set it back to the original, and maybe somebody can look at it later.  -- AH July 2025
 qodana {
     cachePath.set(projectDir.resolve(".qodana").canonicalPath)
-    reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
-    saveReport.set(true)
-    showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false)
+    resultsPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
+    //    saveReport.set(true)
+    //    showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false)
 }
 
+//qodanaScan {
+//    resultsPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
+//    arguments.set(listOf("--fail-threshold", "0"))
+//}
+
 val generateGrammars = tasks.register("generateGrammars") {
     dependsOn("generateParser", "generateLexer")
 }
@@ -107,13 +119,16 @@ tasks {
     }
 
     // Set the JVM compatibility versions
-    properties("javaVersion").let {
-        withType<JavaCompile> {
-            sourceCompatibility = it
-            targetCompatibility = it
-        }
-        withType<KotlinCompile> {
-            kotlinOptions.jvmTarget = it
+    val javaVersion = properties("javaVersion")
+
+    withType<JavaCompile>().configureEach {
+        sourceCompatibility = javaVersion
+        targetCompatibility = javaVersion
+    }
+
+    withType<KotlinCompile>().configureEach {
+        compilerOptions {
+            jvmTarget.set(JvmTarget.fromTarget(javaVersion))
         }
     }
 
@@ -165,9 +180,10 @@ tasks {
         val changelog = project.changelog // local variable for configuration cache compatibility
         // Get the latest available change notes from the changelog file
         changeNotes.set(provider {
-            changelog.run {
-                (getOrNull(properties("pluginVersion")) ?: getUnreleased()).withHeader(false)
-            }.toHTML()
+            changelog.renderItem(
+                changelog.run {
+                    (getOrNull(properties("pluginVersion")) ?: getUnreleased()).withHeader(false)
+                }, Changelog.OutputType.HTML)
         })
     }
 

gradle.properties

@@ -4,39 +4,34 @@
 pluginGroup = io.github.elm-tooling
 pluginName = Elm Language
 # SemVer format -> https://semver.org
-pluginVersion = 5.1.0-beta1
+pluginVersion = 5.1.0-beta2
 
 # We also set since and until build manually in `plugin.xml`. Keep them in sync!
 # See: https://intellij-support.jetbrains.com/hc/en-us/community/posts/360010590059-Why-pluginUntilBuild-is-mandatory
-pluginSinceBuild = 223
+pluginSinceBuild = 242
 # We do not set until build, as we want it to be compatible with new versions. See `plugin.xml`.
-pluginUntilBuild = 251.*
+pluginUntilBuild = 252.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 # 2022.3 and newer require JDK17
 # Upgrading 2021.3.2 to 2022.2.4 resulted in a lot of `Failed to load /src/elm.json: Manifest file not found: /src/elm.json` warnings
 # Upgrading to 2022.3.3 or newer results in massive test failure
 platformType = IC
-platformVersion = 2022.3
+platformVersion = 2024.2
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins =
 
 # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 17
+javaVersion = 21
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.10.2
+gradleVersion = 8.14.3
 
 # Since kotlin 1.4, stdlib dependency is added by default by kotlin gradle plugin.
 # But we don't need it because all necessary kotlin libraries are already bundled into IDE.
 # See https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library for more details
 kotlin.stdlib.default.dependency=false
 
-# Since kotlin 1.8.20, Gradle Kotlin plugin may produce OOM during compilation
-# See https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#incremental-compilation
-# and https://youtrack.jetbrains.com/issue/KT-57757 for more details
-kotlin.incremental.useClasspathSnapshot=false
-
 org.gradle.jvmargs=-Dkotlin.daemon.jvm.options=-Xmx2400m

src/main/kotlin/org/elm/ide/color/ElmColorProvider.kt

@@ -1,6 +1,12 @@
 package org.elm.ide.color
 
-import com.github.ajalt.colormath.*
+import com.github.ajalt.colormath.AngleUnit
+import com.github.ajalt.colormath.Color
+import com.github.ajalt.colormath.formatCssString
+import com.github.ajalt.colormath.hueOr
+import com.github.ajalt.colormath.model.HSL
+import com.github.ajalt.colormath.model.RGB
+import com.github.ajalt.colormath.parse
 import com.intellij.openapi.command.CommandProcessor
 import com.intellij.openapi.editor.ElementColorProvider
 import com.intellij.psi.PsiDocumentManager
@@ -10,15 +16,14 @@ import org.elm.lang.core.psi.ElmTypes.LOWER_CASE_IDENTIFIER
 import org.elm.lang.core.psi.ElmTypes.REGULAR_STRING_PART
 import org.elm.lang.core.psi.elementType
 import org.elm.lang.core.psi.elements.*
-import java.awt.Color
+import java.awt.Color as AwtColor
 import java.util.Locale
-import kotlin.math.roundToInt
 
 private val colorRegex = Regex("""#[0-9a-fA-F]{3,8}\b|\b(?:rgb|hsl)a?\([^)]+\)""")
 
 /** Adds color blocks to the gutter when hex colors exist in a string */
 class ElmColorProvider : ElementColorProvider {
-    override fun getColorFrom(element: PsiElement): Color? {
+    override fun getColorFrom(element: PsiElement): AwtColor? {
         // Like all line markers, we should only provide colors on leaf elements
         if (element.firstChild != null) return null
         return getCssColorFromString(element) ?: getColorFromFuncCall(element)
@@ -27,31 +32,31 @@ class ElmColorProvider : ElementColorProvider {
     // Parse a CSS color from any string that contains one, since "1px solid #1a2b3c" probably
     // contains a color. We don't parse color keywords, since "The red fire truck" is probably not
     // supposed to contain a color.
-    private fun getCssColorFromString(element: PsiElement): Color? {
+    private fun getCssColorFromString(element: PsiElement): AwtColor? {
         if (element.elementType != REGULAR_STRING_PART) return null
         return colorRegex.find(element.text)
-            ?.let { runCatching { ConvertibleColor.fromCss(it.value) }.getOrNull() }
+            ?.let { runCatching { Color.parse(it.value) }.getOrNull() }
             ?.toAwtColor()
     }
 
-    private fun getColorFromFuncCall(element: PsiElement): Color? {
+    private fun getColorFromFuncCall(element: PsiElement): AwtColor? {
         val call = getFuncCall(element) ?: return null
         val color = runCatching {
             // color constructors will throw if the args are out of bounds
             when (call.name) {
                 "rgb", "rgba" -> {
                     if (call.a == null && call.name == "rgba") return null
                     if (call.useFloat) RGB(call.c1, call.c2, call.c3, call.a ?: 1f)
-                    else RGB(call.c1.toInt(), call.c2.toInt(), call.c3.toInt(), call.a ?: 1f)
+                    else RGB.from255(call.c1.toInt(), call.c2.toInt(), call.c3.toInt(), ((call.a ?: 1f) * 255).toInt())
                 }
-                "rgb255" -> RGB(call.c1.toInt(), call.c2.toInt(), call.c3.toInt())
-                "rgba255" -> RGB(call.c1.toInt(), call.c2.toInt(), call.c3.toInt(), call.a ?: return null)
+                "rgb255" -> RGB.from255(call.c1.toInt(), call.c2.toInt(), call.c3.toInt())
+                "rgba255" -> RGB.from255(call.c1.toInt(), call.c2.toInt(), call.c3.toInt(), ((call.a ?: 1f) * 255).toInt())
                 "hsl" -> HSL(call.c1, call.c2, call.c3)
                 "hsla" -> HSL(call.c1, call.c2, call.c3, call.a ?: return null)
                 else -> return null
-            }
+            }.toAwtColor()
         }.getOrNull()
-        return color?.toAwtColor()
+        return color
     }
 
     private fun getFuncCall(element: PsiElement): FuncCall? {
@@ -82,7 +87,7 @@ class ElmColorProvider : ElementColorProvider {
         )
     }
 
-    override fun setColorTo(element: PsiElement, color: Color) {
+    override fun setColorTo(element: PsiElement, color: AwtColor) {
         if (element.firstChild != null) return
         val command = stringColorSettingRunnable(element, color)
             ?: functionColorSettingRunnable(element, color)
@@ -99,13 +104,13 @@ class ElmColorProvider : ElementColorProvider {
         )
     }
 
-    private fun functionColorSettingRunnable(element: PsiElement, color: Color): Runnable? {
+    private fun functionColorSettingRunnable(element: PsiElement, color: AwtColor): Runnable? {
         val funcCall = getFuncCall(element)
         val call = funcCall ?: return null
         return Runnable { setColorInFunctionCall(element, color, call) }
     }
 
-    private fun setColorInFunctionCall(element: PsiElement, color: Color, call: FuncCall) {
+    private fun setColorInFunctionCall(element: PsiElement, color: AwtColor, call: FuncCall) {
         val factory = ElmPsiFactory(element.project)
 
         fun ElmNumberConstantExpr.replace(c: Int, float: Boolean) {
@@ -115,9 +120,9 @@ class ElmColorProvider : ElementColorProvider {
 
         if (call.name.startsWith("hsl")) {
             val hsl = color.toRGB().toHSL()
-            call.args[0].replace(factory.createNumberConstant(hsl.h.toFloat().render()))
-            call.args[1].replace(factory.createNumberConstant((hsl.s / 100f).render()))
-            call.args[2].replace(factory.createNumberConstant((hsl.l / 100f).render()))
+            call.args[0].replace(factory.createNumberConstant(hsl.hueOr(0).render()))
+            call.args[1].replace(factory.createNumberConstant(hsl.s.render()))
+            call.args[2].replace(factory.createNumberConstant(hsl.l.render()))
         } else {
             call.args[0].replace(color.red, call.useFloat)
             call.args[1].replace(color.green, call.useFloat)
@@ -127,12 +132,12 @@ class ElmColorProvider : ElementColorProvider {
         call.args.getOrNull(3)?.replace(color.alpha, true)
     }
 
-    private fun stringColorSettingRunnable(element: PsiElement, color: Color): Runnable? {
+    private fun stringColorSettingRunnable(element: PsiElement, color: AwtColor): Runnable? {
         if (element.elementType != REGULAR_STRING_PART) return null
         return Runnable { setCssColorInString(element, color) }
     }
 
-    private fun setCssColorInString(element: PsiElement, color: Color) {
+    private fun setCssColorInString(element: PsiElement, color: AwtColor) {
         val parent = element.parent as? ElmStringConstantExpr ?: return
         val match = colorRegex.find(element.text)?.value ?: return
 
@@ -142,15 +147,15 @@ class ElmColorProvider : ElementColorProvider {
 
         val newColor = when {
             match.startsWith("#") -> rgb.toHex()
-            match.startsWith("rgb") -> rgb.toCssRgb(
-                commas = commas,
-                namedRgba = match.startsWith("rgba"),
-                rgbPercent = percentCount > 1,
+            match.startsWith("rgb") -> rgb.formatCssString(
+                legacyFormat = commas,
+                legacyName = match.startsWith("rgba"),
+                unitsPercent = percentCount > 1,
                 alphaPercent = percentCount == 1 || percentCount == 4
             )
-            match.startsWith("hsl") -> rgb.toCssHsl(
-                commas = commas,
-                namedHsla = match.startsWith("hsla"),
+            match.startsWith("hsl") -> rgb.toHSL().formatCssString(
+                legacyFormat = commas,
+                legacyName = match.startsWith("hsla"),
                 hueUnit = when {
                     "deg" in match -> AngleUnit.DEGREES
                     "grad" in match -> AngleUnit.GRADIANS
@@ -189,14 +194,14 @@ private data class FuncCall(
     }
 }
 
-fun com.github.ajalt.colormath.Color.toAwtColor(): Color = toRGB().let {
-    Color(it.r, it.g, it.b, (it.a * 255).roundToInt())
+fun Color.toAwtColor(): AwtColor = toSRGB().let {
+    AwtColor(it.r, it.g, it.b, it.alpha)
 }
 
-private fun Color.toRGB() = RGB(red, green, blue, alpha / 255f)
+private fun AwtColor.toRGB() = RGB.from255(red, green, blue, alpha)
 
 private fun Float.render(): String = when (this) {
     0f -> "0"
     1f -> "1"
-    else -> String.format(Locale.ENGLISH, "%.4f", this).trimEnd('0').trimEnd('.')
+    else -> String.format(Locale.ENGLISH, "%.2f", this).trimEnd('0').trimEnd('.')
 }

src/main/kotlin/org/elm/ide/docs/ElmDocumentationProvider.kt

@@ -217,7 +217,7 @@ private fun documentationFor(element: ElmFieldType): String? = buildString {
         i { append("field") }
         append(" ", name)
         if (fieldTy !is TyUnknown) {
-            append(": ", fieldTy.renderedText(true, false))
+            append(": ", fieldTy.renderedText(linkify = true, withModule = false))
         }
         if (recordTy.alias != null) {
             i { append(" of record ") }