Merge pull request #112 from doki-theme/2023.3

Added 2023.3 Build Support.

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+## 88.5-1.1.0 [2023.3 Build Support]
+
+### Added
+- Initial 2023.3 build support.
+
 ## 88.5-1.0.13 [2023.2 Build Support]
 
 ### Added

RELEASE-NOTES.md

@@ -1,2 +1,2 @@
 ### Added
-- Initial 2023.2 build support.
+- Initial 2023.3 build support.

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
   // Kotlin support
   kotlin("jvm") version "1.8.10"
   // Gradle IntelliJ Plugin
-  id("org.jetbrains.intellij") version "1.13.2"
+  id("org.jetbrains.intellij") version "1.16.1"
   // Gradle Changelog Plugin
   id("org.jetbrains.changelog") version "2.0.0"
   // Gradle Qodana Plugin

gradle.properties

@@ -2,22 +2,22 @@
 
 pluginGroup = io.unthrottled.doki.icons
 pluginName = Doki Theme Icons
-pluginVersion = 88.5-1.0.13
+pluginVersion = 88.5-1.1.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 222
-pluginUntilBuild = 232.*
+pluginSinceBuild = 233.8264.8
+pluginUntilBuild = 233.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension
 platformType = IU
-platformVersion = 2022.3.2
+platformVersion = 2023.3.2
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = io.acari.DDLCTheme:88.3-1.8.0,Pythonid:223.8617.56
+platformPlugins = Pythonid:233.13135.103
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.5.1
+gradleVersion = 8.5
 
 # Opt-out flag for bundling Kotlin standard library -> https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
 # suppress inspection "UnusedProperty"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt

@@ -3,7 +3,6 @@ package io.unthrottled.doki.icons.jetbrains.integrations
 import com.google.gson.GsonBuilder
 import com.intellij.ide.IdeBundle
 import com.intellij.ide.nls.NlsMessages
-import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.ApplicationNamesInfo
@@ -25,7 +24,6 @@ import io.unthrottled.doki.icons.jetbrains.tools.runSafely
 import java.awt.Component
 import java.lang.management.ManagementFactory
 import java.text.SimpleDateFormat
-import java.util.Arrays
 import java.util.Properties
 import java.util.stream.Collectors
 
@@ -100,7 +98,6 @@ class ErrorReporter : ErrorReportSubmitter() {
       setExtra("GC", getGC())
       setExtra("Memory", Runtime.getRuntime().maxMemory() / FileUtilRt.MEGABYTE)
       setExtra("Cores", Runtime.getRuntime().availableProcessors())
-      setExtra("Non-Bundled Plugins", getNonBundledPlugins())
       setExtra("Plugin Config", gson.toJson(Config.instance))
     }
   }
@@ -120,12 +117,6 @@ class ErrorReporter : ErrorReportSubmitter() {
     return IdeBundle.message("about.box.vm", vmVersion, vmVendor)
   }
 
-  private fun getNonBundledPlugins(): String {
-    return Arrays.stream(PluginManagerCore.getPlugins())
-      .filter { p -> !p.isBundled && p.isEnabled }
-      .map { p -> p.pluginId.idString }.collect(Collectors.joining(","))
-  }
-
   private fun getGC() = ManagementFactory.getGarbageCollectorMXBeans().stream()
     .map { it.name }.collect(Collectors.joining(","))
 

src/main/kotlin/io/unthrottled/doki/icons/jetbrains/listeners/ProjectListener.kt

@@ -2,7 +2,7 @@ package io.unthrottled.doki.icons.jetbrains.listeners
 
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.ProjectManagerListener
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
 import io.unthrottled.doki.icons.jetbrains.PluginMaster
 import io.unthrottled.doki.icons.jetbrains.tools.Logging
 
@@ -14,8 +14,9 @@ internal class ProjectListener :
   }
 }
 
-internal class PluginPostStartUpActivity : StartupActivity {
-  override fun runActivity(project: Project) {
+internal class PluginPostStartUpActivity : ProjectActivity {
+
+  override suspend fun execute(project: Project) {
     PluginMaster.instance.handleProjectOpened(project)
   }
 }

src/main/kotlin/io/unthrottled/doki/icons/jetbrains/onboarding/UpdateNotification.kt

@@ -20,7 +20,7 @@ private fun buildUpdateMessage(): String =
   """
       What's New?<br>
       <ul>
-        <li>Added initial 2023.2 build support.</li>
+        <li>Added initial 2023.3 build support.</li>
       </ul>
       <br>See the <a href="https://github.com/doki-theme/doki-theme-icons-jetbrains#documentation">documentation</a> for features, usages, and configurations.
       <br>The <a href="https://github.com/doki-theme/doki-theme-icons-jetbrains/blob/master/CHANGELOG.md">changelog</a> is available for more details.

src/main/kotlin/io/unthrottled/doki/icons/jetbrains/shared/Functions.kt

@@ -0,0 +1,12 @@
+package io.unthrottled.doki.icons.jetbrains.shared
+
+fun toLongArray(bytArray: ByteArray): LongArray {
+  val digest = LongArray(bytArray.size)
+  bytArray.forEachIndexed { index, byte -> digest[index] = byte.toLong() }
+  return digest
+}
+fun toByteArray(longArray: LongArray): ByteArray {
+  val digest = ByteArray(longArray.size)
+  longArray.forEachIndexed { index, byte -> digest[index] = byte.toByte() }
+  return digest
+}

src/main/kotlin/io/unthrottled/doki/icons/jetbrains/svg/ComposedSVGColorizerProvider.kt

@@ -1,26 +1,19 @@
 package io.unthrottled.doki.icons.jetbrains.svg
 
-import com.intellij.util.SVGLoader
 import com.intellij.util.io.DigestUtil
+import io.unthrottled.doki.icons.jetbrains.shared.toByteArray
+import io.unthrottled.doki.icons.jetbrains.shared.toLongArray
 import io.unthrottled.doki.icons.jetbrains.themes.DokiThemePayload
 import io.unthrottled.doki.icons.jetbrains.tools.runSafelyWithResult
-import org.w3c.dom.Element
 
 class ComposedSVGColorizer(
   private val patchers: List<Patcher>
 ) : Patcher {
-  override fun patchColors(svg: Element) {
-    patchers.forEach {
-      it.patchColors(svg)
-    }
-  }
 
-  override fun digest(): ByteArray? {
-    val shaDigest = DigestUtil.sha512()
-    patchers.forEach { patchers ->
-      shaDigest.update(patchers.digest() ?: emptyByteArray)
+  override fun patchColors(attributes: MutableMap<String, String>) {
+    patchers.forEach {
+      it.patchColors(attributes)
     }
-    return shaDigest.digest()
   }
 }
 
@@ -39,12 +32,24 @@ class ComposedSVGColorizerProvider(
   )
     .distinct()
 
-  override fun forPath(path: String?): SVGLoader.SvgElementColorPatcher? =
+  private val digest: LongArray
+
+  init {
+    val shaDigest = DigestUtil.sha512()
+    patcherProviders.forEach { patchers ->
+      shaDigest.update(toByteArray(patchers.digest()))
+    }
+    digest = toLongArray(shaDigest.digest())
+  }
+
+  override fun digest(): LongArray = digest
+
+  override fun attributeForPath(path: String): Patcher =
     ComposedSVGColorizer(
       patcherProviders
         .mapNotNull { patcherProvider ->
           runSafelyWithResult({
-            patcherProvider.forPath(path)
+            patcherProvider.attributeForPath(path)
           }) {
             null
           }