User: rednesto Date: 03 Feb 24 09:59 Revision: fd610a4c72dbd84fc92fec6774acfc554328e86a Summary: Hopefully fix minecraft-dev/mcdev-error-report#1861 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9083&personal=false Index: src/main/kotlin/facet/MinecraftFacet.kt =================================================================== --- src/main/kotlin/facet/MinecraftFacet.kt (revision 2acbe60f46e90177117a15e13fe4d233601426c6) +++ src/main/kotlin/facet/MinecraftFacet.kt (revision fd610a4c72dbd84fc92fec6774acfc554328e86a) @@ -44,6 +44,7 @@ import com.intellij.psi.PsiClass import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod +import com.intellij.util.application import java.util.concurrent.ConcurrentHashMap import javax.swing.Icon import org.jetbrains.jps.model.java.JavaResourceRootType @@ -231,7 +232,7 @@ private class RefreshRootsException : Exception() @Throws(RefreshRootsException::class) - private fun findFile0(path: String, type: SourceType): VirtualFile? { + private fun findFile0(path: String, type: SourceType): VirtualFile? = application.runReadAction { val roots = roots[type] for (root in roots) { @@ -239,10 +240,10 @@ if (!r.isValid) { throw RefreshRootsException() } - return r.findFileByRelativePath(path) ?: continue + return@runReadAction r.findFileByRelativePath(path) ?: continue } - return null + return@runReadAction null } companion object {