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

Report exception from script definition loading to third party plugin if it's present

Browse Source
This commit is contained in:
Natalia Selezneva
2019-06-18 11:20:12 +03:00
parent 2fce671d0d
commit b503b29c51
1 changed files with 9 additions and 1 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
+9 -1
View File
@@ -16,7 +16,9 @@
package org.jetbrains.kotlin.idea.core.script package org.jetbrains.kotlin.idea.core.script
import com.intellij.diagnostic.PluginException
import com.intellij.execution.console.IdeConsoleRootType import com.intellij.execution.console.IdeConsoleRootType
import com.intellij.ide.plugins.PluginManagerCore
import com.intellij.ide.scratch.ScratchFileService import com.intellij.ide.scratch.ScratchFileService
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.application.runWriteAction
@@ -259,7 +261,13 @@ fun loadDefinitionsFromTemplates(
LOG.warn("[kts] cannot load script definition class $templateClassName") LOG.warn("[kts] cannot load script definition class $templateClassName")
null null
} catch (e: Throwable) { } catch (e: Throwable) {
LOG.error("[kts] cannot load script definition class $templateClassName", e) val message = "[kts] cannot load script definition class $templateClassName"
val thirdPartyPlugin = PluginManagerCore.getPluginByClassName(templateClassName)
if (thirdPartyPlugin != null) {
LOG.error(PluginException(message, e, thirdPartyPlugin))
} else {
LOG.error(message, e)
}
null null
} }
} }