Update IDE plugin to 2024.2 (#707)

* Update the ide plugin to 2024.2

* Add ide plugin verification task

Author: chippmann

.github/workflows/build_jvm.yml

@@ -100,3 +100,7 @@ jobs:
         with:
           name: jvm_godot-bootstrap_debug
           path: modules/kotlin_jvm/kt/godot-library/build/libs/godot-bootstrap.jar
+
+      - name: Verify ide plugin
+        run: |
+          modules/kotlin_jvm/kt/gradlew -p modules/kotlin_jvm/kt/ verifyPlugin

kt/.gitignore

@@ -1,6 +1,7 @@
 # Ignore Gradle project-specific cache directory
 .gradle
 .kotlin
+.intellijPlatform
 
 # Ignore Gradle build output directory
 build

kt/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.jvm) apply false
     id("com.utopia-rise.versioninfo")
     alias(libs.plugins.gradleIntelliJPlugin) apply false
+    alias(libs.plugins.ideaSync) apply false
 }
 
 version = fullGodotKotlinJvmVersion

kt/gradle/libs.versions.toml

@@ -4,6 +4,7 @@ godotKotlinJvm = "0.10.0"
 kotlin = "2.0.20" # https://kotlinlang.org/docs/releases.html#release-details
 kotlinCoroutine = "1.8.1"
 godot = "4.3.0"
+ideaPluginDefaultIntellijVersion = "2024.2"
 
 shadowJar = "8.3.0" # https://github.com/johnrengelman/shadow/releases
 # TODO: bump kotlin poet version once: https://github.com/square/kotlinpoet/issues/1759 is fixed
@@ -20,8 +21,8 @@ grgit = "5.2.2" # https://github.com/ajoberstar/grgit/releases
 gradlePublish = "1.2.1" # https://plugins.gradle.org/plugin/com.gradle.plugin-publish
 
 changelog = "2.2.1" # https://github.com/JetBrains/gradle-changelog-plugin/releases
-gradleIntelliJPlugin = "1.17.4" # https://plugins.gradle.org/plugin/org.jetbrains.intellij
-ideaSync = "1.1.8" # https://plugins.gradle.org/plugin/org.jetbrains.gradle.plugin.idea-ext
+gradleIntelliJPlugin = "2.1.0" # https://plugins.gradle.org/plugin/org.jetbrains.intellij
+ideaSync = "1.1.9" # https://plugins.gradle.org/plugin/org.jetbrains.gradle.plugin.idea-ext
 kotlinPreProcessors = "0.2.0" # https://github.com/utopia-rise/kotlin-preprocessors/tags
 
 iosJdk = "21"
@@ -40,10 +41,11 @@ ideaSync = { module = "org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
-gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij.platform", version.ref = "gradleIntelliJPlugin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 java = { id = "java" }
 grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
 shadowJar = { id = "com.gradleup.shadow", version.ref = "shadowJar" }
 gradlePublish = { id = "com.gradle.plugin-publish", version.ref = "gradlePublish" }
 kotlinPreProcessors = { id = "com.utopia-rise.kotlin-preprocessors", version.ref = "kotlinPreProcessors" }
+ideaSync = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "ideaSync" }

kt/plugins/godot-intellij-plugin/build.gradle.kts

@@ -18,67 +18,49 @@ plugins {
     id("com.utopia-rise.versioninfo")
 }
 
-//sdk version: https://github.com/JetBrains/intellij-community/tags
-//kotlin plugin version: https://plugins.jetbrains.com/plugin/6954-kotlin/versions
-val buildMatrix: Map<String, BuildConfig> = mapOf(
-    "IJ232" to BuildConfig(
-        sdk = "232.8660.185",
-        prefix = "IJ2023.2",
-        extraSource = "",
-        version = VersionRange("232.1", ""), // empty is the same as 999.* was before
-        ideVersionsForVerifierTask = listOf("2023.2"),
-        deps = listOf(
-            "java",
-            "org.jetbrains.kotlin",
-            "gradle"
-        ) // kotlin plugin version no longer needed as it's now bundled with the IDE
-    )
-)
-
 // needed as the intellij plugin does add its own repositories and thus the ones defined in the settings.gradle.kts are ignored. Hence, we need to redefine them here
 repositories {
     mavenLocal()
     mavenCentral()
     google()
     maven { url = uri("https://plugins.gradle.org/m2/") } // needed for shadowJar plugin dependency implementation in `godot-gradle-plugin`
+
+    intellijPlatform {
+        defaultRepositories()
+    }
 }
 
 version = fullGodotKotlinJvmVersion
-
 group = "com.utopia-rise"
 
-val sdkVersion = project.properties["godot.plugins.intellij.version"] ?: "IJ232"
-val settings = checkNotNull(buildMatrix[sdkVersion])
-
-// Configure gradle-intellij-plugin plugin.
-// Read more: https://github.com/JetBrains/gradle-intellij-plugin
-intellij {
-    pluginName.set("godot-jvm-idea-plugin")
-    version.set(settings.sdk)
-    type.set("IC")
-    downloadSources.set(true)
-    updateSinceUntilBuild.set(true)
-
-    plugins.set(settings.deps)
-}
+val intellijVersion: String = project.properties["godot.plugins.intellij.version"]?.toString() ?: libs.versions.ideaPluginDefaultIntellijVersion.get()
 
 kotlin {
-    jvmToolchain(17)
-
-    sourceSets {
-        main {
-            kotlin.srcDirs("src/${settings.extraSource}/kotlin")
-        }
-    }
+    jvmToolchain(21)
 }
 
 dependencies {
     implementation("com.utopia-rise:tools-common:$fullGodotKotlinJvmVersion")
     implementation("com.utopia-rise:jvm-godot-resource-serialization:0.1.0")
     implementation(project(":godot-build-props"))
     implementation(project(":godot-plugins-common"))
+
+    // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html
+    intellijPlatform {
+        intellijIdeaCommunity(intellijVersion)
+
+        bundledPlugin("com.intellij.java")
+        bundledPlugin("org.jetbrains.kotlin")
+        bundledPlugin("com.intellij.gradle")
+
+        instrumentationTools()
+        pluginVerifier()
+        zipSigner()
+    }
 }
 
+intellijPlatform.pluginVerification.ides.ide(intellijVersion)
+
 tasks {
     runIde {
         jvmArgs("-Xmx2000m")
@@ -87,12 +69,11 @@ tasks {
     patchPluginXml {
         if (isSnapshot) {
             val projectVersion = project.version as String
-            version.set("${projectVersion.removeSuffix("-SNAPSHOT")}-${settings.prefix}-SNAPSHOT")
+            this.pluginVersion.set("${projectVersion.removeSuffix("-SNAPSHOT")}-IJ$intellijVersion-SNAPSHOT")
         } else {
-            version.set("${project.version}-${settings.prefix}")
+            this.pluginVersion.set("${project.version}-IJ$intellijVersion")
         }
-        sinceBuild.set(settings.version.since)
-        untilBuild.set(settings.version.until)
+        sinceBuild.set("242.3")
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
         pluginDescription.set(
@@ -111,10 +92,6 @@ tasks {
         changeNotes.set(changelog.renderItem(changelog.getLatest(), Changelog.OutputType.HTML))
     }
 
-    runPluginVerifier {
-        ideVersions.set(settings.ideVersionsForVerifierTask)
-    }
-
     publishPlugin {
         dependsOn("patchChangelog")
         token.set(System.getenv("GODOT_KOTLIN_INTELLIJ_PLUGIN_PUBLISH"))
@@ -130,8 +107,8 @@ tasks {
     }
 
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        kotlinOptions {
-            freeCompilerArgs += "-Xjvm-default=all"
+        compilerOptions {
+            freeCompilerArgs.add("-Xjvm-default=all")
         }
     }
 }

kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/property/PropertyHintAnnotationChecker.kt

@@ -12,7 +12,6 @@ import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.GodotTypes
 import godot.tools.common.constants.godotAnnotationPackage
 import godot.tools.common.constants.godotCorePackage
-import org.jetbrains.kotlin.idea.refactoring.fqName.fqName
 import org.jetbrains.kotlin.idea.util.findAnnotation
 import org.jetbrains.kotlin.js.descriptorUtils.getKotlinTypeFqName
 import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi
@@ -113,7 +112,7 @@ class PropertyHintAnnotationChecker {
 
     private fun checkEnumFlag(ktProperty: KtProperty, holder: AnnotationHolder) {
         checkForRegistrationAnnotation(ktProperty, holder)
-        if (ktProperty.type()?.fqName?.asString()?.matches(Regex("^kotlin\\.collections\\..*Set\$")) == false) {
+        if (ktProperty.type()?.getKotlinTypeFqName(false)?.matches(Regex("^kotlin\\.collections\\..*Set\$")) == false) {
             holder.registerProblem(
                 GodotPluginBundle.message("problem.property.hint.wrongType", "kotlin.collections.Set or kotlin.collections.MutableSet"),
                 ktProperty.findAnnotation(FqName("$godotAnnotationPackage.${GodotKotlinJvmTypes.Annotations.enumFlag}"))?.psiOrParent ?: ktProperty.nameIdentifier ?: ktProperty.navigationElement

kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/CallFunctionReferenceChecker.kt

@@ -8,9 +8,9 @@ import godot.intellij.plugin.extension.type
 import godot.intellij.plugin.quickfix.TargetFunctionNotRegisteredQuickFix
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.godotApiPackage
-import org.jetbrains.kotlin.idea.refactoring.fqName.fqName
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.util.findAnnotation
+import org.jetbrains.kotlin.js.descriptorUtils.getKotlinTypeFqName
 import org.jetbrains.kotlin.name.FqName
 
 
@@ -65,7 +65,7 @@ object CallFunctionReferenceChecker {
 
     private fun isGodotFunction(containingClass: KtClass?, callReference: KtNameReferenceExpression?) =
         containingClass?.fqName?.asString() == "$godotApiPackage.${GodotKotlinJvmTypes.obj}" ||
-            containingClass?.type()?.supertypes()?.map { it.fqName?.asString() }?.any { it == "$godotApiPackage.${GodotKotlinJvmTypes.obj}" } == true ||
+            containingClass?.type()?.supertypes()?.map { it.getKotlinTypeFqName(false) }?.any { it == "$godotApiPackage.${GodotKotlinJvmTypes.obj}" } == true ||
             isGodotExtensionFunction(callReference)
 
     private fun isGodotExtensionFunction(callReference: KtNameReferenceExpression?): Boolean {

kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/annotator/reference/SignalFunctionReferenceChecker.kt

@@ -9,10 +9,10 @@ import godot.intellij.plugin.extension.type
 import godot.intellij.plugin.quickfix.TargetFunctionNotRegisteredQuickFix
 import godot.tools.common.constants.GodotKotlinJvmTypes
 import godot.tools.common.constants.godotCorePackage
-import org.jetbrains.kotlin.idea.refactoring.fqName.fqName
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.util.findAnnotation
+import org.jetbrains.kotlin.js.descriptorUtils.getKotlinTypeFqName
 import org.jetbrains.kotlin.name.FqName
 
 
@@ -39,8 +39,8 @@ object SignalFunctionReferenceChecker {
             )?.type()
 
         if (
-            type?.fqName?.asString() == "$godotCorePackage.${GodotKotlinJvmTypes.signal}" ||
-            type?.supertypes()?.map { it.fqName?.asString() }?.any { it == "$godotCorePackage.${GodotKotlinJvmTypes.signal}" } == true
+            type?.getKotlinTypeFqName(false) == "$godotCorePackage.${GodotKotlinJvmTypes.signal}" ||
+            type?.supertypes()?.map { it.getKotlinTypeFqName(false) }?.any { it == "$godotCorePackage.${GodotKotlinJvmTypes.signal}" } == true
         ) {
             val targetFunction = element
                 .callableReference

kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/gradle/GodotKotlinJvmSettings.kt

@@ -13,6 +13,7 @@ import com.intellij.ui.EditorNotifications
 import godot.intellij.plugin.GodotPluginBundle
 import godot.intellij.plugin.notification.SettingsFetchingNotification
 import godot.plugins.common.GodotKotlinJvmPropertiesFile
+import godot.plugins.common.gradle.action.FetchProjectModelsBuildAction
 import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper
 import org.jetbrains.plugins.gradle.settings.DistributionType
 import org.jetbrains.plugins.gradle.settings.GradleExecutionSettings

kt/plugins/godot-intellij-plugin/src/main/kotlin/godot/intellij/plugin/gradle/GradleSystemListener.kt

@@ -6,7 +6,7 @@ import com.intellij.openapi.externalSystem.model.task.ExternalSystemTaskType.RES
 import godot.intellij.plugin.notification.SettingsFetchingNotification
 import org.jetbrains.kotlin.idea.configuration.GRADLE_SYSTEM_ID
 
-class GradleSystemListener : ExternalSystemTaskNotificationListenerAdapter() {
+class GradleSystemListener : ExternalSystemTaskNotificationListenerAdapter(null) {
     override fun onStart(
         id: ExternalSystemTaskId,
         workingDir: String?,