MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[PyCharm] Jupyter/RemoteDev (fix): Hotfix for split mode "jupyter-web" resources. #PY-79794 Fixed

Browse Source 
(cherry picked from commit 5523996afd4033e6ac53ec3faf53f3129a404b2a)

IJ-CR-158841

GitOrigin-RevId: 7dea97f584b34060cdba751fe8826960b843d74e
This commit is contained in:
Nikita Pavlenko
2025-03-13 17:34:22 +01:00
committed by intellij-monorepo-bot
parent 75b46f3048
commit dd7a948851
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterCefHttpHandlerBase.kt
View File

@@ -44,12 +44,18 @@ abstract class JupyterCefHttpHandlerBase(private val absolutePathFiles: Set<Stri
var url = javaClass.classLoader.getResource(path)
?: (javaClass.classLoader as? PluginAwareClassLoader)?.pluginDescriptor?.getPluginPath()?.normalize()?.resolve(path)?.toUri()?.toURL()
//Fixme Newest version of hack for split mode.
// Frontend files "jupyter-web", is now not under lib folder, but directly under jupyter-plugin.
if (url.toString().contains("plugins/jupyter-plugin/lib/jupyter-web/")) {
url = URL(url.toString().replace("plugins/jupyter-plugin/lib/jupyter-web/", "plugins/jupyter-plugin/jupyter-web/"))
}
// In remote dev, when we run remote-front via 'split (dev-build)' run config, we have:
// (javaClass.classLoader as PluginClassLoader).getAllParents().mapNotNull{it as? PluginClassLoader}.map() { loader -> loader.pluginDescriptor.pluginPath }
// = out/classes/production/intellij.jupyter.plugin.frontend or out/classes/production/intellij.notebooks.plugin
// PathUtil.getJarPathForClass(javaClass) = out/classes/production/intellij.jupyter.core
// But our resources lie not in out/classes but in out/dev-run
if (url.toString().contains("out/classes/production/intellij.jupyter.plugin.frontend")) {
else if (url.toString().contains("out/classes/production/intellij.jupyter.plugin.frontend")) {
url = URL(url.toString().replace("out/classes/production/intellij.jupyter.plugin.frontend", "out/dev-run/Python/plugins/jupyter-plugin"))
}