Initial work on 2022.1 support

Author: RedNesto

build.gradle.kts

@@ -69,6 +69,7 @@ val gradleToolingExtensionJar = tasks.register<Jar>(gradleToolingExtensionSource
 
 repositories {
     maven("https://repo.denwav.dev/repository/maven-public/")
+    maven("https://www.jetbrains.com/intellij-repository/snapshots")
     mavenCentral()
 }
 
@@ -154,7 +155,7 @@ tasks.publishPlugin {
 }
 
 tasks.runPluginVerifier {
-    ideVersions.addAll("IC-2021.3")
+    ideVersions.addAll("IC-2022.1")
 }
 
 java {
@@ -180,11 +181,9 @@ tasks.withType<KotlinCompile>().configureEach {
 // This is for maximum compatibility, these classes will be loaded into every Gradle import on all
 // projects (not just Minecraft), so we don't want to break that with an incompatible class version.
 tasks.named(gradleToolingExtensionSourceSet.compileJavaTaskName, JavaCompile::class) {
-    val java7Compiler = javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(8)) }
+    val java7Compiler = javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(11)) }
     javaCompiler.set(java7Compiler)
-    options.release.set(null as Int?)
-    sourceCompatibility = "1.5"
-    targetCompatibility = "1.5"
+    options.release.set(6)
     options.bootstrapClasspath = files(java7Compiler.map { it.metadata.installationPath.file("jre/lib/rt.jar") })
     options.compilerArgs = listOf("-Xlint:-options")
 }

gradle.properties

@@ -11,10 +11,10 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 2021.3
-ideaVersionName = 2021.3
+ideaVersion = 221-EAP-SNAPSHOT
+ideaVersionName = 2022.1
 
 coreVersion = 1.5.18
 downloadIdeaSources = true
 
-pluginTomlVersion = 213.5744.224
+pluginTomlVersion = 221.3427.87

gradle/libs.versions.toml

@@ -15,7 +15,7 @@ jflex-skeleton = "org.jetbrains.idea:jflex:1.7.0-c1fdf11"
 grammarKit = "org.jetbrains.idea:grammar-kit:1.5.1"
 
 # Gradle Tooling
-gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:213.5744.223"
+gradleToolingExtension = "com.jetbrains.intellij.gradle:gradle-tooling-extension:221.3427.89-EAP-SNAPSHOT"
 annotations = "org.jetbrains:annotations:20.1.0"
 groovy = "org.codehaus.groovy:groovy-all:2.5.14"
 

src/main/kotlin/nbt/editor/NbtFileEditorProvider.kt

@@ -65,6 +65,7 @@ private class NbtFileEditor(
 ) : FileEditor {
 
     private var editor: FileEditor? = null
+    private val editorCheckedDisposable = Disposer.newCheckedDisposable()
     private val component = JPanel(BorderLayout())
 
     init {
@@ -83,6 +84,7 @@ private class NbtFileEditor(
         editor?.let { editor ->
             try {
                 Disposer.register(this, editor)
+                Disposer.register(editor, editorCheckedDisposable)
             } catch (e: IncorrectOperationException) {
                 // The editor can be disposed really quickly when opening a large number of NBT files
                 // Since everything happens basically at the same time, calling Disposer.isDisposed right before
@@ -140,7 +142,7 @@ private class NbtFileEditor(
     override fun toString() = editor.toString()
 
     private inline fun <T : Any?> FileEditor?.exec(action: FileEditor.() -> T): T? {
-        if (editor?.let { ed -> Disposer.isDisposed(ed) } == true) {
+        if (editor == null || editorCheckedDisposable.isDisposed) {
             return null
         }
         return this?.action()

src/main/kotlin/translations/index/providers.kt

@@ -14,6 +14,7 @@ import com.demonwav.mcdev.translations.Translation
 import com.demonwav.mcdev.translations.lang.LangFile
 import com.demonwav.mcdev.translations.lang.LangFileType
 import com.demonwav.mcdev.translations.lang.gen.psi.LangEntry
+import com.demonwav.mcdev.util.childrenOfType
 import com.google.gson.JsonParser
 import com.google.gson.JsonSyntaxException
 import com.intellij.json.JsonFileType
@@ -30,7 +31,6 @@ import com.intellij.psi.util.CachedValueProvider
 import com.intellij.psi.util.CachedValuesManager
 import com.intellij.psi.util.PsiModificationTracker
 import com.intellij.util.indexing.FileContent
-import org.jetbrains.plugins.groovy.lang.psi.util.childrenOfType
 
 interface TranslationProvider {
     fun map(domain: String, input: FileContent): TranslationIndexEntry?

src/test/kotlin/framework/ProjectBuilderTest.kt

@@ -35,7 +35,7 @@ abstract class ProjectBuilderTest(descriptor: LightProjectDescriptor? = null) {
 
     init {
         val lightFixture = IdeaTestFixtureFactory.getFixtureFactory()
-            .createLightFixtureBuilder(descriptor)
+            .createLightFixtureBuilder(descriptor, "mcdev_test_project")
             .fixture
 
         // This is a poorly named class - it actually means create a temp dir test fixture _in-memory_