Merge branch '2022.3' into 2023.1

Earthcomputer · Earthcomputer · commit b0c7c8c3a799 · 2023-09-16T14:08:07.000+01:00
# Conflicts:
#	src/main/kotlin/creator/step/AbstractLatentStep.kt
diff --git a/src/main/kotlin/creator/step/AbstractLatentStep.kt b/src/main/kotlin/creator/step/AbstractLatentStep.kt
@@ -84,12 +84,12 @@ abstract class AbstractLatentStep<T>(parent: NewProjectWizardStep) : AbstractNew
                 return@launch
             }
 
-            val result = asyncIO {
+            val (result: T?, errorMessage: String?) = asyncIO {
                 try {
-                    computeData()
+                    computeData() to null
                 } catch (e: Throwable) {
-                    LOGGER.error(e)
-                    null
+                    LOGGER.warn("computeData failed", e)
+                    null to e.message
                 }
             }.await()
 
@@ -105,17 +105,11 @@ abstract class AbstractLatentStep<T>(parent: NewProjectWizardStep) : AbstractNew
                 if (result == null) {
                     placeholder.component = panel {
                         row {
-                            val label = label(MCDevBundle("creator.ui.generic_validation_failure.message", description))
+                            val labelValidationText =
+                                MCDevBundle("creator.ui.generic_validation_failure.message", description, errorMessage)
+                            val label = label(labelValidationText)
                                 .validationRequestor(WHEN_GRAPH_PROPAGATION_FINISHED(propertyGraph))
-                                .validation(
-                                    DialogValidation {
-                                        val labelValidationText = MCDevBundle(
-                                            "creator.ui.generic_validation_failure.message",
-                                            description
-                                        )
-                                        ValidationInfo(labelValidationText)
-                                    }
-                                )
+                                .validation(DialogValidation { ValidationInfo(labelValidationText) })
                             label.component.foreground = JBColor.RED
                         }
                     }
diff --git a/src/main/kotlin/errorreporter/ErrorReporter.kt b/src/main/kotlin/errorreporter/ErrorReporter.kt
@@ -44,6 +44,8 @@ class ErrorReporter : ErrorReportSubmitter() {
     private val ignoredErrorMessages = listOf(
         "Key com.demonwav.mcdev.translations.TranslationFoldingSettings duplicated",
         "Inspection #EntityConstructor has no description",
+        "VFS name enumerator corrupted",
+        "PersistentEnumerator storage corrupted",
     )
     override fun getReportActionText() = MCDevBundle("error_reporter.submit.action")
 
diff --git a/src/main/kotlin/platform/bukkit/creator/ui-steps.kt b/src/main/kotlin/platform/bukkit/creator/ui-steps.kt
@@ -78,11 +78,7 @@ abstract class AbstractBukkitPlatformStep(
     override val description = "download versions"
 
     override suspend fun computeData() = coroutineScope {
-        try {
-            asyncIO { getVersionSelector(platform) }.await()
-        } catch (e: Throwable) {
-            null
-        }
+        asyncIO { getVersionSelector(platform) }.await()
     }
 
     override fun createStep(data: PlatformVersion) =
diff --git a/src/main/kotlin/platform/bukkit/inspection/BukkitListenerImplementedInspection.kt b/src/main/kotlin/platform/bukkit/inspection/BukkitListenerImplementedInspection.kt
@@ -30,6 +30,7 @@ import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
 import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
+import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
 
 class BukkitListenerImplementedInspection : BaseInspection() {
 
@@ -44,10 +45,10 @@ class BukkitListenerImplementedInspection : BaseInspection() {
         "All Bukkit @EventHandler methods must reside in a class that implements Listener."
 
     override fun buildFix(vararg infos: Any): InspectionGadgetsFix {
+        val classPointer = (infos[0] as PsiClass).createSmartPointer()
         return object : InspectionGadgetsFix() {
             override fun doFix(project: Project, descriptor: ProblemDescriptor) {
-                val psiClass = infos[0] as PsiClass
-                psiClass.addImplements(BukkitConstants.LISTENER_CLASS)
+                classPointer.element?.addImplements(BukkitConstants.LISTENER_CLASS)
             }
 
             @Nls
@@ -61,11 +62,7 @@ class BukkitListenerImplementedInspection : BaseInspection() {
     override fun buildVisitor(): BaseInspectionVisitor {
         return object : BaseInspectionVisitor() {
             override fun visitClass(aClass: PsiClass) {
-                if (
-                    aClass.methods.none {
-                        it.modifierList.findAnnotation(BukkitConstants.HANDLER_ANNOTATION) != null
-                    }
-                ) {
+                if (aClass.methods.none { it.hasAnnotation(BukkitConstants.HANDLER_ANNOTATION) }) {
                     return
                 }
 
diff --git a/src/main/kotlin/platform/bungeecord/creator/ui-steps.kt b/src/main/kotlin/platform/bungeecord/creator/ui-steps.kt
@@ -72,11 +72,7 @@ abstract class AbstractBungeePlatformStep(
     override val description = "download versions"
 
     override suspend fun computeData() = coroutineScope {
-        try {
-            asyncIO { getVersionSelector(platform) }.await()
-        } catch (e: Throwable) {
-            null
-        }
+        asyncIO { getVersionSelector(platform) }.await()
     }
 
     override fun createStep(data: PlatformVersion) =
diff --git a/src/main/kotlin/platform/bungeecord/inspection/BungeeCordListenerImplementedInspection.kt b/src/main/kotlin/platform/bungeecord/inspection/BungeeCordListenerImplementedInspection.kt
@@ -30,6 +30,7 @@ import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
 import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
+import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
 
 class BungeeCordListenerImplementedInspection : BaseInspection() {
 
@@ -43,10 +44,10 @@ class BungeeCordListenerImplementedInspection : BaseInspection() {
         "All BungeeCord @EventHandler methods must reside in a class that implements Listener."
 
     override fun buildFix(vararg infos: Any): InspectionGadgetsFix {
+        val classPointer = (infos[0] as PsiClass).createSmartPointer()
         return object : InspectionGadgetsFix() {
             override fun doFix(project: Project, descriptor: ProblemDescriptor) {
-                val psiClass = infos[0] as PsiClass
-                psiClass.addImplements(BungeeCordConstants.LISTENER_CLASS)
+                classPointer.element?.addImplements(BungeeCordConstants.LISTENER_CLASS)
             }
 
             @Nls
diff --git a/src/main/kotlin/platform/mcp/inspections/StackEmptyInspection.kt b/src/main/kotlin/platform/mcp/inspections/StackEmptyInspection.kt
@@ -40,6 +40,7 @@ import com.siyeh.ig.BaseInspection
 import com.siyeh.ig.BaseInspectionVisitor
 import com.siyeh.ig.InspectionGadgetsFix
 import org.jetbrains.annotations.Nls
+import org.jetbrains.kotlin.psi.psiUtil.createSmartPointer
 
 class StackEmptyInspection : BaseInspection() {
     companion object {
@@ -63,14 +64,17 @@ class StackEmptyInspection : BaseInspection() {
             " the stack should still be considered empty. Instead, isEmpty() should be called."
 
     override fun buildFix(vararg infos: Any): InspectionGadgetsFix {
+        val compareExpressionPointer = (infos[0] as PsiExpression).createSmartPointer()
+        val binaryExpressionPointer = (infos[2] as PsiBinaryExpression).createSmartPointer()
         return object : InspectionGadgetsFix() {
             override fun getFamilyName() = "Replace with .isEmpty()"
 
             override fun doFix(project: Project, descriptor: ProblemDescriptor) {
-                val compareExpression = infos[0] as PsiExpression
-                val binaryExpression = infos[2] as PsiBinaryExpression
                 val elementFactory = JavaPsiFacade.getElementFactory(project)
 
+                val compareExpression = compareExpressionPointer.element ?: return
+                val binaryExpression = binaryExpressionPointer.element ?: return
+
                 val mappedIsEmpty = compareExpression.findModule()?.getMappedMethod(IS_EMPTY_SRG)?.name ?: "isEmpty"
 
                 var expressionText = "${compareExpression.text}.$mappedIsEmpty()"
diff --git a/src/main/kotlin/platform/mixin/inspection/suppress/MixinClassCastInspectionSuppressor.kt b/src/main/kotlin/platform/mixin/inspection/suppress/MixinClassCastInspectionSuppressor.kt
@@ -39,21 +39,25 @@ import com.intellij.psi.PsiExpression
 import com.intellij.psi.PsiInstanceOfExpression
 import com.intellij.psi.PsiType
 import com.intellij.psi.PsiTypeCastExpression
+import com.intellij.psi.PsiTypeTestPattern
 import com.intellij.psi.util.PsiUtil
 
 /**
- * Looks for `ConstantConditions` warnings on type casts and checks if they are casts to interfaces introduced by mixins
+ * Looks for `ConstantConditions`, `ConstantValue` and `DataFlowIssue` warnings on type casts and checks if they are
+ * casts to interfaces introduced by mixins
  */
 class MixinClassCastInspectionSuppressor : InspectionSuppressor {
 
     override fun isSuppressedFor(element: PsiElement, toolId: String): Boolean {
-        if (toolId != INSPECTION) {
+        if (toolId !in INSPECTIONS) {
             return false
         }
 
         // check instanceof
         if (element is PsiInstanceOfExpression) {
-            val castType = element.checkType?.type ?: return false
+            val castType = element.checkType?.type
+                ?: (element.pattern as? PsiTypeTestPattern)?.checkType?.type
+                ?: return false
             var operand = PsiUtil.skipParenthesizedExprDown(element.operand) ?: return false
             while (operand is PsiTypeCastExpression) {
                 operand = PsiUtil.skipParenthesizedExprDown(operand.operand) ?: return false
@@ -126,6 +130,6 @@ class MixinClassCastInspectionSuppressor : InspectionSuppressor {
         SuppressQuickFix.EMPTY_ARRAY
 
     companion object {
-        private const val INSPECTION = "ConstantConditions"
+        private val INSPECTIONS = setOf("ConstantConditions", "ConstantValue", "DataFlowIssue")
     }
 }
diff --git a/src/main/kotlin/platform/mixin/util/Mixin.kt b/src/main/kotlin/platform/mixin/util/Mixin.kt
@@ -201,7 +201,7 @@ fun isAssignable(left: PsiType, right: PsiType): Boolean {
 private fun isClassAssignable(leftClass: PsiClass, rightClass: PsiClass): Boolean {
     var result = false
     InheritanceUtil.processSupers(rightClass, true) {
-        if (it == leftClass) {
+        if (it.qualifiedName == leftClass.qualifiedName) {
             result = true
             false
         } else {
diff --git a/src/main/kotlin/platform/sponge/SpongeVersion.kt b/src/main/kotlin/platform/sponge/SpongeVersion.kt
@@ -20,23 +20,12 @@
 
 package com.demonwav.mcdev.platform.sponge
 
-import com.demonwav.mcdev.creator.getText
-import com.demonwav.mcdev.util.fromJson
-import com.google.gson.Gson
-import com.intellij.openapi.diagnostic.logger
+import com.demonwav.mcdev.creator.getVersionJson
 
 data class SpongeVersion(var versions: LinkedHashMap<String, String>, var selectedIndex: Int) {
     companion object {
-        private val LOGGER = logger<SpongeVersion>()
-
         suspend fun downloadData(): SpongeVersion? {
-            return try {
-                val text = getText("sponge_v2.json")
-                Gson().fromJson(text, SpongeVersion::class)
-            } catch (e: Exception) {
-                LOGGER.error("Failed to download Sponge version json", e)
-                null
-            }
+            return getVersionJson<SpongeVersion>("sponge_v2.json")
         }
     }
 }
diff --git a/src/main/kotlin/platform/velocity/creator/ui-steps.kt b/src/main/kotlin/platform/velocity/creator/ui-steps.kt
@@ -51,11 +51,7 @@ class VelocityPlatformStep(parent: PluginPlatformStep) : AbstractLatentStep<Plat
     override val description = "download Velocity versions"
 
     override suspend fun computeData() = coroutineScope {
-        try {
-            asyncIO { getVersionSelector(PlatformType.VELOCITY) }.await()
-        } catch (e: Throwable) {
-            null
-        }
+        asyncIO { getVersionSelector(PlatformType.VELOCITY) }.await()
     }
 
     override fun createStep(data: PlatformVersion) =
diff --git a/src/main/kotlin/util/utils.kt b/src/main/kotlin/util/utils.kt
@@ -368,11 +368,13 @@ inline fun loggerForTopLevel() = Logger.getInstance(MethodHandles.lookup().looku
 inline fun <T> runCatchingKtIdeaExceptions(action: () -> T): T? = try {
     action()
 } catch (e: Exception) {
-    if (e.javaClass.name == "org.jetbrains.kotlin.idea.caches.resolve.KotlinIdeaResolutionException") {
-        loggerForTopLevel().info("Caught Kotlin plugin exception", e)
-        null
-    } else {
-        throw e
+    when (e.javaClass.name) {
+        "org.jetbrains.kotlin.idea.caches.resolve.KotlinIdeaResolutionException",
+        "org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments" -> {
+            loggerForTopLevel().info("Caught Kotlin plugin exception", e)
+            null
+        }
+        else -> throw e
     }
 }
 
diff --git a/src/main/resources/messages/MinecraftDevelopment.properties b/src/main/resources/messages/MinecraftDevelopment.properties
@@ -50,7 +50,7 @@ creator.ui.mixins.label=Use Mixins:
 creator.ui.outdated.message=Is the Minecraft project wizard outdated? \
   <a href="{0}">Create an issue</a> on the MinecraftDev issue tracker.
 
-creator.ui.generic_validation_failure.message=Unable to {0}
+creator.ui.generic_validation_failure.message=Unable to {0} {1}
 creator.ui.generic_unfinished.message=Haven''t finished {0}
 
 creator.ui.create_minecraft_project=Create a new Minecraft project

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,8 @@ class ErrorReporter : ErrorReportSubmitter() {`
`44`	`44`	`private val ignoredErrorMessages = listOf(`
`45`	`45`	`"Key com.demonwav.mcdev.translations.TranslationFoldingSettings duplicated",`
`46`	`46`	`"Inspection #EntityConstructor has no description",`
	`47`	`+ "VFS name enumerator corrupted",`
	`48`	`+ "PersistentEnumerator storage corrupted",`
`47`	`49`	`)`
`48`	`50`	`override fun getReportActionText() = MCDevBundle("error_reporter.submit.action")`
`49`	`51`