Fix for compatibility issues and upgrading to k2 support

Author: dinbtechit

CHANGELOG.md

@@ -3,9 +3,12 @@
 # vscode-theme Changelog
 
 ## Unreleased
+### Added
+- Support k2 compiler
 ### Changed
 - Removing Deprecated APIs
-- Min intellj Platform SDK is now 243
+- Min intellj Platform SDK is now 242
+- JDK version to 21
 
 ## 1.10.13 - 2024-11-23
 

build.gradle.kts

@@ -16,7 +16,7 @@ version = providers.gradleProperty("pluginVersion").get()
 
 // Set the JVM language level used to build the project.
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 // Configure project's dependencies

gradle.properties

@@ -4,15 +4,15 @@ pluginGroup = com.github.dinbtechit.vscodetheme
 pluginName = VSCode Theme
 # SemVer format -> https://semver.org
 
-pluginVersion = 1.10.15
+pluginVersion = 1.11.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 233
+pluginSinceBuild = 242
 pluginUntilBuild = 243.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IU
-platformVersion = 2023.3
+platformVersion = 2024.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 #platformPlugins = JavaScript, com.intellij.java, io.flutter:75.1.4, Dart:232.9559.10, PsiViewer:232.2, \
@@ -21,12 +21,17 @@ platformVersion = 2023.3
 
 # 2023.3
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
-platformPlugins =  io.flutter:77.0.1, Dart:233.11799.172, PsiViewer:233.2, \
-Pythonid:233.11799.300, PythonCore:233.11799.241, com.jetbrains.php:233.11799.300, org.jetbrains.plugins.go:233.11799.196, \
-com.jetbrains.rust:233.21799.284
+#platformPlugins =  io.flutter:77.0.1, Dart:233.11799.172, PsiViewer:233.2, \
+#Pythonid:233.11799.300, PythonCore:233.11799.241, com.jetbrains.php:233.11799.300, org.jetbrains.plugins.go:233.11799.196, \
+#com.jetbrains.rust:233.21799.284
+
+#2024.3
+platformPlugins =  io.flutter:82.2.4, Dart:243.22562.3, PsiViewer:243.7768, org.jetbrains.android:243.21565.214, \
+Pythonid:243.21565.211, PythonCore:243.21565.211, com.jetbrains.php:243.21565.211, org.jetbrains.plugins.go:243.21565.211, \
+com.jetbrains.rust:243.21565.245
 
 # Example: platformBundledPlugins = com.intellij.java
-platformBundledPlugins = JavaScript, com.intellij.java, com.jetbrains.sh, org.jetbrains.kotlin
+platformBundledPlugins = JavaScript, com.intellij.java, com.jetbrains.sh, org.jetbrains.kotlin, 
 
 # 2022.3.3
 #platformPlugins = JavaScript, com.intellij.java, io.flutter:75.1.2, Dart:223.8950, PsiViewer:2022.3, \

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ junit = "4.13.2"
 # plugins
 changelog = "2.2.1"
 intelliJPlatform = "2.1.0"
-kotlin = "1.9.25"
+kotlin = "2.1.0"
 kover = "0.8.3"
 qodana = "2024.2.3"
 

src/main/kotlin/com/github/dinbtechit/vscodetheme/VSCodeThemeManager.kt

@@ -2,27 +2,7 @@ package com.github.dinbtechit.vscodetheme
 
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
-import com.intellij.openapi.actionSystem.ActionManager
-import com.intellij.openapi.actionSystem.AnActionEvent
-import com.intellij.openapi.actionSystem.DataContext
-import com.intellij.openapi.actionSystem.Presentation
-import com.intellij.openapi.actionSystem.impl.SimpleDataContext
-import com.intellij.openapi.diagnostic.logger
 import com.intellij.openapi.extensions.PluginId
-import com.intellij.openapi.project.ProjectManager
-import org.jetbrains.kotlin.console.actions.logError
-
-/*enum class VSCodeTheme(val theme: String) {
-    UNKNOWN("UNKNOWN"),
-    DARK("VSCode Dark"),
-    DARK_MODERN("VSCode Dark Modern");
-}*/
-
-object VSCodeTheme {
-    const val UNKNOWN = "UNKNOWN"
-    const val DARK = "VSCode Dark"
-    const val DARK_MODERN = "VSCode Dark Modern"
-}
 
 class VSCodeThemeManager {
     companion object {
@@ -40,33 +20,4 @@ class VSCodeThemeManager {
     fun isVSCodeThemeReady(): Boolean {
       return getPlugin() != null
     }
-
-    fun showThemePopUp() {
-        //ShowSettingsUtil.getInstance().showSettingsDialog(null, "preferences.lookFeel")
-        val action = ActionManager.getInstance().getAction("ChangeLaf")
-        if (action != null) {
-            val openProjects = ProjectManager.getInstance().openProjects
-            if (openProjects.isNullOrEmpty()) return
-
-            val dataContext: DataContext = SimpleDataContext.getProjectContext(openProjects.first())
-
-            val presentation = Presentation()
-            val event = AnActionEvent(
-                null,
-                dataContext,
-                "",
-                presentation,
-                ActionManager.getInstance(),
-                0
-            )
-
-            // Perform the action
-            action.actionPerformed(event)
-        }
-        else {
-            logger<VSCodeThemeManager>().warn("ChangeLaf action was not found - Unable to show all themes")
-        }
-    }
-
-
 }

src/main/kotlin/com/github/dinbtechit/vscodetheme/actions/AlwaysApplyThemeAction.kt

@@ -1,8 +1,7 @@
 package com.github.dinbtechit.vscodetheme.actions
 
-import com.github.dinbtechit.vscodetheme.VSCodeTheme
-import com.github.dinbtechit.vscodetheme.VSCodeThemeManager
 import com.intellij.icons.AllIcons
+import com.intellij.ide.actions.QuickChangeLookAndFeel
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.DumbAwareAction
 
@@ -11,8 +10,8 @@ class AlwaysApplyThemeAction(
 ) : DumbAwareAction(text, "", AllIcons.General.Settings) {
 
     override fun actionPerformed(e: AnActionEvent) {
-        VSCodeThemeManager.getInstance().showThemePopUp()
-        //VSCodeStartupNotifyActivity.notification.hideBalloon()
+        val action = QuickChangeLookAndFeel()
+        action.actionPerformed(e)
         /*NotificationsManagerImpl.getNotificationsManager().expire(
             VSCodeStartupNotifyActivity.notification
         )*/

src/main/kotlin/com/github/dinbtechit/vscodetheme/settings/VSCodeThemeSettingsStore.kt

@@ -1,6 +1,5 @@
 package com.github.dinbtechit.vscodetheme.settings
 
-import com.github.dinbtechit.vscodetheme.VSCodeTheme
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.PersistentStateComponent
 import com.intellij.openapi.components.State

src/main/kotlin/com/github/dinbtechit/vscodetheme/startup/VSCodeStartupNotifyActivity.kt

@@ -1,6 +1,5 @@
 package com.github.dinbtechit.vscodetheme.startup
 
-import com.github.dinbtechit.vscodetheme.VSCodeTheme
 import com.github.dinbtechit.vscodetheme.VSCodeThemeManager
 import com.github.dinbtechit.vscodetheme.actions.AlwaysApplyThemeAction
 import com.github.dinbtechit.vscodetheme.actions.DonateAction
@@ -15,19 +14,15 @@ import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.startup.ProjectActivity
+
 
-/*enum class DisplayActionType {
-    DONATION_ONLY,
-    SHOW_ALL_THEMES_FOR_DEFAULT,
-    SHOW_NEW_DARK_MODERN_THEME
-}*/
 object DisplayActionType {
     const val DONATION_ONLY = "DONATION_ONLY"
     const val SHOW_ALL_THEMES_FOR_DEFAULT = "SHOW_ALL_THEMES_FOR_DEFAULT"
 }
 
-class VSCodeStartupNotifyActivity : StartupActivity {
+class VSCodeStartupNotifyActivity : ProjectActivity {
 
 
     private val updateContent: String by lazy {
@@ -41,16 +36,7 @@ class VSCodeStartupNotifyActivity : StartupActivity {
     private val switchThemeQuestion: String by lazy {
         //language=HTML
         """
-          Set one of the <b>VSCode Theme(s)</b> as a default theme.
-          <br/>
-          $updateContent
-        """.trimIndent()
-    }
-
-    private val tryNewDarkModernThemeQuestion: String by lazy {
-        //language=HTML
-        """
-          Would you like to set the <b>VSCode Dark Modern</b> as a default theme?
+          Select <b>VSCode Theme(s)</b> from themes.
           <br/>
           $updateContent
         """.trimIndent()
@@ -65,7 +51,7 @@ class VSCodeStartupNotifyActivity : StartupActivity {
         const val pluginId = "com.github.dinbtechit.vscodetheme"
     }
 
-    override fun runActivity(project: Project) {
+    override suspend fun execute(project: Project) {
         val settings = VSCodeThemeSettingsStore.instance
         val isReady = VSCodeThemeManager.getInstance().isVSCodeThemeReady()
         if (isReady && getPlugin()?.version != VSCodeThemeSettingsStore.instance.version) {

src/main/resources/META-INF/lang-config/dinbtechit-kotlin.xml

@@ -4,4 +4,7 @@
                    implementationClass="com.github.dinbtechit.vscodetheme.annotators.KotlinAnnotator"/>
         <colorSettingsPage order="last" implementation="com.github.dinbtechit.vscodetheme.annotators.settings.KtColorSettingsPage"/>
     </extensions>
+    <extensions defaultExtensionNs="org.jetbrains.kotlin">
+        <supportsKotlinPluginMode supportsK2="true"/>
+    </extensions>
 </idea-plugin>

src/main/resources/META-INF/plugin.xml

@@ -20,7 +20,6 @@
     <depends config-file="lang-config/dinbtechit-rust.xml" optional="true">com.jetbrains.rust</depends>
     <depends config-file="lang-config/dinbtechit-sh.xml" optional="true">com.jetbrains.sh</depends>
     <!--<depends config-file="lang-config/dinbtechit-typescript.xml" optional="true">JavaScript</depends>-->
-
     <extensions defaultExtensionNs="com.intellij">
         <themeProvider order="first" id="dinbtechit-2179230b863b9b1d9f1eeb27ca4a3a70" path="themes/vscode_dark_modern.theme.json"/>
         <themeProvider order="last" id="dinbtechit-7ef0c378d737e162955f3e028dcf9ccb" path="themes/vscode_dark.theme.json"/>