azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ScriptDefinitionsManager: safeGetDefinitions shouldn't catch ControlFlowException

Browse Source 
#EA-210332 Fixed
This commit is contained in:
Dmitry Gridin
2019-08-16 16:54:50 +07:00
parent ef4bac1b46
commit 23e79bb32b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+2
View File
@@ -24,6 +24,7 @@ import com.intellij.ide.scratch.ScratchRootType
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.application.runWriteAction
import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.diagnostic.ControlFlowException
import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.extensions.ExtensionPointName import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.extensions.Extensions
@@ -203,6 +204,7 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit
if (!failedContributorsHashes.contains(this@safeGetDefinitions.hashCode())) try { if (!failedContributorsHashes.contains(this@safeGetDefinitions.hashCode())) try {
return definitions.toList() return definitions.toList()
} catch (t: Throwable) { } catch (t: Throwable) {
if (t is ControlFlowException) throw t
// reporting failed loading only once // reporting failed loading only once
LOG.error("[kts] cannot load script definitions using $this", t) LOG.error("[kts] cannot load script definitions using $this", t)
failedContributorsHashes.add(this@safeGetDefinitions.hashCode()) failedContributorsHashes.add(this@safeGetDefinitions.hashCode())