2022.3 EAP

Author: RedNesto

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
     mcdev
     groovy
     idea
-    id("org.jetbrains.intellij") version "1.8.0"
+    id("org.jetbrains.intellij") version "1.9.0"
     id("org.cadixdev.licenser")
     id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
 }
@@ -41,7 +41,7 @@ version = "$ideaVersionName-$coreVersion"
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -182,12 +182,12 @@ tasks.runPluginVerifier {
 tasks.withType<JavaCompile>().configureEach {
     options.encoding = "UTF-8"
     options.compilerArgs = listOf("-proc:none")
-    options.release.set(11)
+    options.release.set(17)
 }
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = listOf("-Xjvm-default=all")
     }
 }

gradle.properties

@@ -11,10 +11,13 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 2022.2
-ideaVersionName = 2022.2
+ideaVersion = 223-EAP-SNAPSHOT
+ideaVersionName = 2022.3
 
 coreVersion = 1.5.20
 downloadIdeaSources = true
 
-pluginTomlVersion = 222.3345.108
+pluginTomlVersion = 223.4884.72
+
+# Silences a build-time warning because we are bundling our own kotlin library
+kotlin.stdlib.default.dependency = true

src/main/kotlin/inspection/WrongEntityDataParameterClassInspection.kt

@@ -35,11 +35,8 @@ class WrongEntityDataParameterClassInspection : AbstractBaseJavaLocalInspectionT
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor = Visitor(holder)
 
     class Visitor(private val holder: ProblemsHolder) : JavaElementVisitor() {
-        override fun visitMethodCallExpression(expression: PsiMethodCallExpression?) {
+        override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
             super.visitMethodCallExpression(expression)
-            if (expression == null) {
-                return
-            }
 
             val method = expression.resolveMethod() ?: return
             val className = method.containingClass?.fullQualifiedName ?: return

src/main/kotlin/platform/forge/inspections/sideonly/VariableUseSideOnlyInspection.kt

@@ -33,8 +33,8 @@ class VariableUseSideOnlyInspection : BaseInspection() {
 
     override fun buildVisitor(): BaseInspectionVisitor {
         return object : BaseInspectionVisitor() {
-            override fun visitReferenceExpression(expression: PsiReferenceExpression?) {
-                if (!SideOnlyUtil.beginningCheck(expression!!)) {
+            override fun visitReferenceExpression(expression: PsiReferenceExpression) {
+                if (!SideOnlyUtil.beginningCheck(expression)) {
                     return
                 }
 

src/main/kotlin/platform/mixin/inspection/UnusedMixinInspection.kt

@@ -39,8 +39,8 @@ class UnusedMixinInspection : MixinInspection() {
     override fun buildVisitor(holder: ProblemsHolder) = Visitor(holder)
 
     class Visitor(private val holder: ProblemsHolder) : JavaElementVisitor() {
-        override fun visitClass(clazz: PsiClass?) {
-            val module = clazz?.findModule() ?: return
+        override fun visitClass(clazz: PsiClass) {
+            val module = clazz.findModule() ?: return
             if (clazz.isMixin) {
                 for (config in MixinModule.getMixinConfigs(module.project, GlobalSearchScope.moduleScope(module))) {
                     if (config.qualifiedMixins.any { it == clazz.fullQualifiedName }) {

src/main/kotlin/platform/mixin/util/AsmUtil.kt

@@ -618,15 +618,15 @@ private fun findAssociatedLambda(psiClass: PsiClass, clazz: ClassNode, lambdaMet
         var result: PsiElement? = null
         parent.accept(
             object : JavaRecursiveElementWalkingVisitor() {
-                override fun visitAnonymousClass(aClass: PsiAnonymousClass?) {
+                override fun visitAnonymousClass(aClass: PsiAnonymousClass) {
                     // skip anonymous classes
                 }
 
-                override fun visitClass(aClass: PsiClass?) {
+                override fun visitClass(aClass: PsiClass) {
                     // skip inner classes
                 }
 
-                override fun visitLambdaExpression(expression: PsiLambdaExpression?) {
+                override fun visitLambdaExpression(expression: PsiLambdaExpression) {
                     if (i++ == index) {
                         result = expression
                         stopWalking()

src/main/kotlin/platform/mixin/util/LocalVariables.kt

@@ -278,15 +278,15 @@ object LocalVariables {
                     super.visitForeachStatement(statement)
                 }
 
-                override fun visitClass(aClass: PsiClass?) {
+                override fun visitClass(aClass: PsiClass) {
                     // don't recurse into classes
                 }
 
-                override fun visitMethod(method: PsiMethod?) {
+                override fun visitMethod(method: PsiMethod) {
                     // don't recurse into methods
                 }
 
-                override fun visitLambdaExpression(expression: PsiLambdaExpression?) {
+                override fun visitLambdaExpression(expression: PsiLambdaExpression) {
                     // don't recurse into lambdas
                 }
             }