Fix K2 mode incompatibility

minecraft-dev · Sep 29, 2024 · e97d7e4 · e97d7e4
1 parent 3c82c6b
commit e97d7e4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -322,6 +322,12 @@ tasks.runIde {
         systemProperty("idea.ProcessCanceledException", "disabled")
         systemProperty("idea.debug.mode", "true")
     }
+
+    // Kotlin K2 is enabled by default, uncomment to switch to K1
+    // jvmArgumentProviders += CommandLineArgumentProvider {
+    //     listOf("-Didea.kotlin.plugin.use.k2=false")
+    // }
+
     // Set these properties to test different languages
     // systemProperty("user.language", "fr")
     // systemProperty("user.country", "FR")

diff --git a/src/main/kotlin/insight/generation/EventGenHelper.kt b/src/main/kotlin/insight/generation/EventGenHelper.kt
@@ -33,6 +33,10 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.codeStyle.CodeStyleManager
 import com.intellij.psi.util.parentOfType
+import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferences
+import org.jetbrains.kotlin.idea.base.analysis.api.utils.shortenReferencesInRange
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginMode
+import org.jetbrains.kotlin.idea.base.plugin.KotlinPluginModeProvider
 import org.jetbrains.kotlin.idea.core.ShortenReferences
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
@@ -108,15 +112,22 @@ class KotlinEventGenHelper : EventGenHelper {
         val factory = KtPsiFactory.contextual(context)
         val entry = factory.createSuperTypeEntry(fqn)
         val insertedEntry = ktClass.addSuperTypeListEntry(entry)
-        ShortenReferences.DEFAULT.process(insertedEntry)
+        when (KotlinPluginModeProvider.currentPluginMode) {
+            KotlinPluginMode.K1 -> ShortenReferences.DEFAULT.process(insertedEntry)
+            // TODO find a non-internal alternative to this...
+            KotlinPluginMode.K2 -> shortenReferences(insertedEntry)
+        }
     }
 
     override fun reformatAndShortenRefs(file: PsiFile, startOffset: Int, endOffset: Int) {
         file as? KtFile ?: return
         val project = file.project
 
         val marker = JvmEventGenHelper.doReformat(project, file, startOffset, endOffset) ?: return
-
-        ShortenReferences.DEFAULT.process(file, marker.startOffset, marker.endOffset)
+        when (KotlinPluginModeProvider.currentPluginMode) {
+            KotlinPluginMode.K1 -> ShortenReferences.DEFAULT.process(file, marker.startOffset, marker.endOffset)
+            // TODO find a non-internal alternative to this...
+            KotlinPluginMode.K2 -> shortenReferencesInRange(file, marker.textRange)
+        }
     }
 }