diff --git a/jupyter/intellij.jupyter.core.iml b/jupyter/intellij.jupyter.core.iml index d8b77829ee2b..e086f0a21c6c 100644 --- a/jupyter/intellij.jupyter.core.iml +++ b/jupyter/intellij.jupyter.core.iml @@ -16,7 +16,5 @@ - - \ No newline at end of file diff --git a/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt b/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt index b354c8baba2c..af0b699bbbab 100644 --- a/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt +++ b/jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt @@ -2,7 +2,7 @@ package com.intellij.jupyter.core.jupyter.preview -import com.intellij.ide.plugins.cl.PluginClassLoader +import com.intellij.ide.plugins.cl.PluginAwareClassLoader import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.thisLogger import com.intellij.openapi.util.io.FileUtilRt @@ -48,7 +48,7 @@ abstract class JupyterCefHttpHandlerBase(private val absolutePathFiles: Collecti // After optimizations in PluginClassLoader, classLoader.getResource return null in debug, // so we have additional logic with PluginClassLoader.pluginDescriptor. val url = javaClass.classLoader.getResource(path) - ?: (javaClass.classLoader as? PluginClassLoader)?.pluginDescriptor?.getPluginPath()?.let { Path.of(it.toCanonicalPath(), path) }?.toUri()?.toURL() + ?: (javaClass.classLoader as? PluginAwareClassLoader)?.pluginDescriptor?.getPluginPath()?.let { Path.of(it.toCanonicalPath(), path) }?.toUri()?.toURL() if (url != null) { return url }