User: rednesto Date: 15 Sep 23 12:46 Revision: ad3304afa4ed2fabcda134d40d7ad95520f80f39 Summary: Swallow more errors unrelated to the plugin TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8726&personal=false Index: src/main/kotlin/errorreporter/ErrorReporter.kt =================================================================== --- src/main/kotlin/errorreporter/ErrorReporter.kt (revision 1f32ebe7f4a462a3c306f1b9527669190413c582) +++ src/main/kotlin/errorreporter/ErrorReporter.kt (revision ad3304afa4ed2fabcda134d40d7ad95520f80f39) @@ -44,6 +44,8 @@ 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") Index: src/main/kotlin/util/utils.kt =================================================================== --- src/main/kotlin/util/utils.kt (revision 1f32ebe7f4a462a3c306f1b9527669190413c582) +++ src/main/kotlin/util/utils.kt (revision ad3304afa4ed2fabcda134d40d7ad95520f80f39) @@ -364,13 +364,15 @@ inline fun runCatchingKtIdeaExceptions(action: () -> T): T? = try { action() } catch (e: Exception) { - if (e.javaClass.name == "org.jetbrains.kotlin.idea.caches.resolve.KotlinIdeaResolutionException") { + when (e.javaClass.name) { + "org.jetbrains.kotlin.idea.caches.resolve.KotlinIdeaResolutionException", + "org.jetbrains.kotlin.utils.KotlinExceptionWithAttachments" -> { - loggerForTopLevel().info("Caught Kotlin plugin exception", e) - null + loggerForTopLevel().info("Caught Kotlin plugin exception", e) + null - } else { - throw e - } + } + else -> throw e -} + } +} fun withSuppressed(original: T?, other: T): T = original?.apply { addSuppressed(other) } ?: other