User: rednesto
Date: 02 Jul 23 22:05
Revision: c830dadcc451b85d4bf0e731b4d07e215af89a51
Summary:
Merge branch '2022.2' into 2022.3


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

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 5142284bdd57795812cd299bdab2e201ce4c0a07)
+++ gradle.properties	(revision c830dadcc451b85d4bf0e731b4d07e215af89a51)
@@ -24,7 +24,7 @@
 ideaVersion = 2022.3
 ideaVersionName = 2022.3
 
-coreVersion = 1.6.6
+coreVersion = 1.6.7
 downloadIdeaSources = true
 
 pluginTomlVersion = 223.7571.59
Index: src/main/kotlin/util/utils.kt
===================================================================
--- src/main/kotlin/util/utils.kt	(revision 5142284bdd57795812cd299bdab2e201ce4c0a07)
+++ src/main/kotlin/util/utils.kt	(revision c830dadcc451b85d4bf0e731b4d07e215af89a51)
@@ -365,8 +365,12 @@
     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
     }
 }
+
+fun <T : Throwable> withSuppressed(original: T?, other: T): T =
+    original?.apply { addSuppressed(other) } ?: other