Switch to new alpha K2 compiler

minecraft-dev · Aug 17, 2022 · 5530d6a · 5530d6a
1 parent b76e370
commit 5530d6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -193,7 +193,8 @@ tasks.withType<JavaCompile>().configureEach {
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_11.toString()
-        freeCompilerArgs = listOf("-Xjvm-default=all")
+        freeCompilerArgs = listOf("-Xuse-k2", "-Xjvm-default=all", "-Xjdk-release=11")
+        kotlinDaemonJvmArguments.add("-Xmx1G")
     }
 }
 

diff --git a/src/main/kotlin/platform/mcp/at/completion/AtCompletionContributor.kt b/src/main/kotlin/platform/mcp/at/completion/AtCompletionContributor.kt
@@ -204,7 +204,7 @@ class AtCompletionContributor : CompletionContributor() {
 
         val entry = memberName.parent as? AtEntry ?: return
 
-        val entryClass = entry.className.classNameValue ?: return
+        val entryClass = entry.className?.classNameValue ?: return
 
         val module = ModuleUtilCore.findModuleForPsiElement(memberName) ?: return
         val project = module.project

diff --git a/src/main/kotlin/translations/TranslationFiles.kt b/src/main/kotlin/translations/TranslationFiles.kt
@@ -59,8 +59,12 @@ object TranslationFiles {
         file?.nameWithoutExtension?.lowercase(Locale.ENGLISH)
 
     tailrec fun seekTranslation(element: PsiElement): PsiNamedElement? {
-        return toTranslation(element)?.let { element as? PsiNamedElement }
-            ?: seekTranslation(element.parent ?: return null)
+        // don't use elvis here, K2 doesn't think it's a tail recursive call if you do
+        val res = toTranslation(element)?.let { element as? PsiNamedElement }
+        if (res != null) {
+            return res
+        }
+        return seekTranslation(element.parent ?: return null)
     }
 
     fun toTranslation(element: PsiElement): Translation? =