Migrated references to internal JetBrains SDK APIs. (#61)

doki-theme · Mar 12, 2023 · 597327c · 597327c
1 parent eef728e
commit 597327c
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@
 
 ## [Unreleased]
 
+## 88.3-1.0.11 [Maintenance]
+
+### Fixed
+
+- References to internal JetBrains SDK APIs. 
+
 ## 88.3-1.0.10 [Settings Menu Restoration]
 
 ### Fixed

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -12,4 +12,5 @@
 ### Fixed
 
 - Issue on plugin startup for IDEs with non-JetBrains java runtimes.
-- The VSC Branch icon on the EXP UI.
+- The VSC Branch icon on the EXP UI.
+- References to internal JetBrains SDK APIs. 
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 
 pluginGroup = io.unthrottled.doki.icons
 pluginName = Doki Theme Icons
-pluginVersion = 88.3-1.0.10
+pluginVersion = 88.3-1.0.11
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 222

diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/PluginMaster.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/PluginMaster.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.project.ProjectManagerListener
 import io.unthrottled.doki.icons.jetbrains.laf.LAFIconReplacementComponent
 import io.unthrottled.doki.icons.jetbrains.onboarding.UserOnBoarding
-import io.unthrottled.doki.icons.jetbrains.path.ExperimentalUIBastardizer
+import io.unthrottled.doki.icons.jetbrains.path.ExperimentalUIFixer
 import io.unthrottled.doki.icons.jetbrains.path.IconPathReplacementComponent
 import io.unthrottled.doki.icons.jetbrains.svg.ThemedSVGManager
 import io.unthrottled.doki.icons.jetbrains.themes.IconThemeManager
@@ -19,7 +19,7 @@ class PluginMaster : ProjectManagerListener, Disposable, Logging {
 
   companion object {
     init {
-      ExperimentalUIBastardizer.bastardizeExperimentalUI()
+      ExperimentalUIFixer.fixExperimentalUI()
     }
     val instance: PluginMaster
       get() = ApplicationManager.getApplication().getService(PluginMaster::class.java)

diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/integrations/ErrorReporter.kt
@@ -13,7 +13,6 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.SubmittedReportInfo
 import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.util.io.FileUtilRt
-import com.intellij.openapi.util.registry.Registry
 import com.intellij.util.Consumer
 import io.sentry.Sentry
 import io.sentry.SentryEvent
@@ -101,7 +100,6 @@ class ErrorReporter : ErrorReportSubmitter() {
       setExtra("GC", getGC())
       setExtra("Memory", Runtime.getRuntime().maxMemory() / FileUtilRt.MEGABYTE)
       setExtra("Cores", Runtime.getRuntime().availableProcessors())
-      setExtra("Registry", getRegistry())
       setExtra("Non-Bundled Plugins", getNonBundledPlugins())
       setExtra("Plugin Config", gson.toJson(Config.instance))
     }
@@ -128,9 +126,6 @@ class ErrorReporter : ErrorReportSubmitter() {
       .map { p -> p.pluginId.idString }.collect(Collectors.joining(","))
   }
 
-  private fun getRegistry() = Registry.getAll().stream().filter { it.isChangedFromDefault }
-    .map { v -> v.key + "=" + v.asString() }.collect(Collectors.joining(","))
-
   private fun getGC() = ManagementFactory.getGarbageCollectorMXBeans().stream()
     .map { it.name }.collect(Collectors.joining(","))
 

diff --git a/...tbrains/path/ExperimentalUIBastardizer.kt → ...ons/jetbrains/path/ExperimentalUIFixer.kt b/...tbrains/path/ExperimentalUIBastardizer.kt → ...ons/jetbrains/path/ExperimentalUIFixer.kt
@@ -5,14 +5,14 @@ import com.intellij.openapi.util.IconPathPatcher
 import com.intellij.ui.ExperimentalUI
 import io.unthrottled.doki.icons.jetbrains.tools.runSafely
 
-object ExperimentalUIBastardizer {
+object ExperimentalUIFixer {
 
   init {
-    bastardizeExperimentalUI()
+    fixExperimentalUI()
   }
 
   @Suppress("UnstableApiUsage")
-  fun bastardizeExperimentalUI() {
+  fun fixExperimentalUI() {
     if (!ExperimentalUI.isNewUI()) return
 
     runSafely({

diff --git a/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/path/IconPathReplacementComponent.kt b/src/main/kotlin/io/unthrottled/doki/icons/jetbrains/path/IconPathReplacementComponent.kt
@@ -52,7 +52,7 @@ object IconPathReplacementComponent : IconConfigListener {
   }
 
   fun installComponents() {
-    ExperimentalUIBastardizer.bastardizeExperimentalUI()
+    ExperimentalUIFixer.fixExperimentalUI()
 
     iconInstallPacs.forEach { pak ->
       IconLoader.removePathPatcher(pak.iconPatcher)
@@ -92,7 +92,7 @@ object IconPathReplacementComponent : IconConfigListener {
   }
 
   private fun refresh() {
-    ExperimentalUIBastardizer.bastardizeExperimentalUI()
+    ExperimentalUIFixer.fixExperimentalUI()
     ApplicationManager.getApplication().invokeLater {
       val app = ApplicationManager.getApplication()
       app.runWriteAction { FileTypeManagerEx.getInstanceEx().fireFileTypesChanged() }