User: rednesto
Date: 02 Jul 23 21:24
Revision: 9fe419c236a7fb1b8be768e73055142b27664782
Summary:
Fixes for latest EAP breaking changes


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8562&personal=false

Index: build.gradle.kts
===================================================================
--- build.gradle.kts	(revision 404d31e9df4d674a0fa964d4cbc2242c3ec54b77)
+++ build.gradle.kts	(revision 9fe419c236a7fb1b8be768e73055142b27664782)
@@ -254,6 +254,7 @@
         }
     }
     systemProperty("NO_FS_ROOTS_ACCESS_CHECK", "true")
+    systemProperty("java.awt.headless", "true")
 
     jvmArgs(
         "-Dsun.io.useCanonCaches=false",
Index: gradle.properties
===================================================================
--- gradle.properties	(revision 404d31e9df4d674a0fa964d4cbc2242c3ec54b77)
+++ gradle.properties	(revision 9fe419c236a7fb1b8be768e73055142b27664782)
@@ -21,13 +21,13 @@
 # suppress inspection "UnusedProperty" for whole file
 kotlin.code.style=official
 
-ideaVersion = 232-EAP-SNAPSHOT
+ideaVersion = 232.8453.116-EAP-SNAPSHOT
 ideaVersionName = 2023.2
 
 coreVersion = 1.6.6
 downloadIdeaSources = true
 
-pluginTomlVersion = 232.5150.113
+pluginTomlVersion = 232.8453.111
 
 # Silences a build-time warning because we are bundling our own kotlin library
 kotlin.stdlib.default.dependency = false
Index: src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt	(revision 404d31e9df4d674a0fa964d4cbc2242c3ec54b77)
+++ src/main/kotlin/platform/mixin/insight/MixinTargetLineMarkerProvider.kt	(revision 9fe419c236a7fb1b8be768e73055142b27664782)
@@ -28,7 +28,7 @@
 import com.intellij.codeInsight.daemon.LineMarkerInfo
 import com.intellij.codeInsight.daemon.LineMarkerProviderDescriptor
 import com.intellij.codeInsight.hint.HintManager
-import com.intellij.codeInsight.navigation.NavigationUtil
+import com.intellij.codeInsight.navigation.getPsiElementPopup
 import com.intellij.openapi.editor.markup.GutterIconRenderer
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.psi.PsiAnnotation
@@ -111,10 +111,10 @@
                 }
                 else -> {
                     if (editor != null) {
-                        NavigationUtil.getPsiElementPopup(targets.toTypedArray(), "Choose Target")
+                        getPsiElementPopup(targets.toTypedArray(), "Choose Target")
                             .showInBestPositionFor(editor)
                     } else {
-                        NavigationUtil.getPsiElementPopup(targets.toTypedArray(), "Choose Target")
+                        getPsiElementPopup(targets.toTypedArray(), "Choose Target")
                             .show(RelativePoint(e))
                     }
                 }
Index: src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt
===================================================================
--- src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision 404d31e9df4d674a0fa964d4cbc2242c3ec54b77)
+++ src/main/kotlin/platform/sponge/inspection/SpongePluginClassInspection.kt	(revision 9fe419c236a7fb1b8be768e73055142b27664782)
@@ -90,7 +90,7 @@
                         classIdentifier,
                         "Plugin class must have an empty constructor or an @Inject constructor.",
                         ProblemHighlightType.GENERIC_ERROR,
-                        AddDefaultConstructorFix(aClass),
+                        AddDefaultConstructorFix(aClass).asQuickFix(),
                     )
                 }
             }
Index: src/main/kotlin/util/class-utils.kt
===================================================================
--- src/main/kotlin/util/class-utils.kt	(revision 404d31e9df4d674a0fa964d4cbc2242c3ec54b77)
+++ src/main/kotlin/util/class-utils.kt	(revision 9fe419c236a7fb1b8be768e73055142b27664782)
@@ -22,7 +22,6 @@
 
 import com.intellij.codeInsight.daemon.impl.quickfix.AddMethodFix
 import com.intellij.navigation.AnonymousElementProvider
-import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.CommonClassNames
 import com.intellij.psi.JavaPsiFacade
@@ -30,7 +29,6 @@
 import com.intellij.psi.PsiClassType
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiField
-import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiInvalidElementAccessException
 import com.intellij.psi.PsiJavaFile
 import com.intellij.psi.PsiMethod
@@ -228,15 +226,8 @@
  * Adds the given method to this class, or its copy. Returns the method actually added
  */
 fun PsiClass.addMethod(template: PsiMethod): PsiMethod? {
-    var theNewMethod: PsiMethod? = null
-    object : AddMethodFix(template, this) {
-        override fun postAddAction(file: PsiFile, editor: Editor?, newMethod: PsiMethod?) {
-            theNewMethod = newMethod
-            super.postAddAction(file, editor, newMethod)
+    return AddMethodFix(template, this).createMethod(this)
-        }
+}
-    }.applyFix()
-    return theNewMethod
-}
 
 fun PsiClass.findMatchingMethod(
     pattern: PsiMethod,