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

PY-64586, PY-73739, PY-73825: Move jupyter support for python to the Python plugin and DataSpell plugin instead of creating dedicated plugin

Browse Source 
GitOrigin-RevId: 7d7ef5dc7285bfdc797e1d763254f854ab66b78c
This commit is contained in:
Ilya Muradyan
2024-07-12 01:14:29 +02:00
committed by intellij-monorepo-bot
parent 156145f6ec
commit 0f2ceb1d0a
20 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -479,7 +479,6 @@
<module fileurl="file://$PROJECT_DIR$/plugins/junit/testFramework/intellij.junit.testFramework.iml" filepath="$PROJECT_DIR$/plugins/junit/testFramework/intellij.junit.testFramework.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/junit5_rt/intellij.junit.v5.rt.iml" filepath="$PROJECT_DIR$/plugins/junit5_rt/intellij.junit.v5.rt.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml" filepath="$PROJECT_DIR$/plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/jupyter/intellij.jupyter.core.iml" filepath="$PROJECT_DIR$/jupyter/intellij.jupyter.core.iml" />
<module fileurl="file://$PROJECT_DIR$/jupyter/viewOnly/intellij.jupyter.viewOnly.iml" filepath="$PROJECT_DIR$/jupyter/viewOnly/intellij.jupyter.viewOnly.iml" />
<module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-api/intellij.jvm.analysis.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-api/intellij.jvm.analysis.iml" />
<module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml" />
@@ -546,6 +545,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/intellij.ml.models.local.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/ml-local-models/java/intellij.ml.models.local.java.iml" filepath="$PROJECT_DIR$/plugins/ml-local-models/java/intellij.ml.models.local.java.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" filepath="$PROJECT_DIR$/platform/built-in-server/client/node-rpc-client/intellij.nodeRpcClient.iml" />
<module fileurl="file://$PROJECT_DIR$/jupyter/intellij.notebooks.jupyter.core.iml" filepath="$PROJECT_DIR$/jupyter/intellij.notebooks.jupyter.core.iml" />
<module fileurl="file://$PROJECT_DIR$/notebooks/notebook-ui/intellij.notebooks.ui.iml" filepath="$PROJECT_DIR$/notebooks/notebook-ui/intellij.notebooks.ui.iml" />
<module fileurl="file://$PROJECT_DIR$/notebooks/visualization/intellij.notebooks.visualization.iml" filepath="$PROJECT_DIR$/notebooks/visualization/intellij.notebooks.visualization.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/core/intellij.performanceTesting.iml" />

2
jupyter/gen/com/intellij/jupyter/core/icons/JupyterCoreIcons.java → jupyter/gen/com/intellij/notebooks/jupyter/core/icons/JupyterCoreIcons.java
View File

@@ -1,4 +1,4 @@
package com.intellij.jupyter.core.icons;
package com.intellij.notebooks.jupyter.core.icons;
import com.intellij.ui.IconManager;
import org.jetbrains.annotations.NotNull;

0
jupyter/intellij.jupyter.core.iml → jupyter/intellij.notebooks.jupyter.core.iml
View File

4
jupyter/resources/intellij.jupyter.core.xml → jupyter/resources/intellij.notebooks.jupyter.core.xml
View File

@@ -1,10 +1,10 @@
<idea-plugin package="com.intellij.jupyter.core">
<idea-plugin package="com.intellij.notebooks.jupyter.core">
<!-- Jupyter language -->
<extensions defaultExtensionNs="com.intellij">
<fileType name="Jupyter"
language="Jupyter"
extensions="ipynb"
implementationClass="com.intellij.jupyter.core.jupyter.JupyterFileType"
implementationClass="com.intellij.notebooks.jupyter.core.jupyter.JupyterFileType"
fieldName="INSTANCE"/>
</extensions>
</idea-plugin>

4
jupyter/src/com/intellij/jupyter/core/jupyter/JupyterFileType.kt → jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterFileType.kt
View File

@@ -1,10 +1,10 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.jupyter.core.jupyter
package com.intellij.notebooks.jupyter.core.jupyter
import com.intellij.openapi.fileTypes.LanguageFileType
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.jupyter.core.icons.JupyterCoreIcons
import com.intellij.notebooks.jupyter.core.icons.JupyterCoreIcons
import org.jetbrains.annotations.NonNls
import javax.swing.Icon

4
jupyter/src/com/intellij/jupyter/core/jupyter/JupyterLanguage.kt → jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterLanguage.kt
View File

@@ -1,10 +1,10 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.jupyter.core.jupyter
package com.intellij.notebooks.jupyter.core.jupyter
import com.intellij.lang.Language
import com.intellij.openapi.fileTypes.FileType
import com.intellij.openapi.fileTypes.LanguageFileType
import com.intellij.jupyter.core.lang.NotebookLanguage
import com.intellij.notebooks.jupyter.core.lang.NotebookLanguage
object JupyterLanguage : Language(NotebookLanguage, "Jupyter")

2
jupyter/src/com/intellij/jupyter/core/jupyter/JupyterPsiBundle.kt → jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/JupyterPsiBundle.kt
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.jupyter.core.jupyter
package com.intellij.notebooks.jupyter.core.jupyter
import com.intellij.DynamicBundle
import org.jetbrains.annotations.Nls

2
jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt → jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.jupyter.core.jupyter.preview
package com.intellij.notebooks.jupyter.core.jupyter.preview
import com.intellij.ide.plugins.cl.PluginAwareClassLoader

2
jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterHttpUtils.kt → jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/preview/JupyterHttpUtils.kt
View File

@@ -1,5 +1,5 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.jupyter.core.jupyter.preview
package com.intellij.notebooks.jupyter.core.jupyter.preview
import org.apache.http.client.utils.URIBuilder
import org.jetbrains.ide.BuiltInServerManager

2
jupyter/src/com/intellij/jupyter/core/lang/NotebookLanguage.kt → jupyter/src/com/intellij/notebooks/jupyter/core/lang/NotebookLanguage.kt
View File

@@ -1,4 +1,4 @@
package com.intellij.jupyter.core.lang
package com.intellij.notebooks.jupyter.core.lang
import com.intellij.lang.Language

2
jupyter/viewOnly/intellij.jupyter.viewOnly.iml
View File

@@ -8,7 +8,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.jupyter.core" />
<orderEntry type="module" module-name="intellij.notebooks.jupyter.core" />
<orderEntry type="module" module-name="intellij.platform.editor" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="library" name="jcef" level="project" />

2
jupyter/viewOnly/resources/intellij.jupyter.viewOnly.xml
View File

@@ -1,7 +1,7 @@
<!-- Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. -->
<idea-plugin package="com.intellij.jupyter.viewOnly">
<dependencies>
<module name="intellij.jupyter.core"/>
<module name="intellij.notebooks.jupyter.core"/>
</dependencies>
<extensions defaultExtensionNs="com.intellij">

4
jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyFileEditor.kt
View File

@@ -3,8 +3,8 @@ package com.intellij.jupyter.viewOnly
import com.intellij.ide.ui.LafManagerListener
import com.intellij.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
import com.intellij.jupyter.core.jupyter.preview.addPathSegment
import com.intellij.notebooks.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
import com.intellij.notebooks.jupyter.core.jupyter.preview.addPathSegment
import com.intellij.openapi.actionSystem.ActionManager
import com.intellij.openapi.actionSystem.AnActionEvent
import com.intellij.openapi.actionSystem.DataContext

2
jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyHandler.kt
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.jupyter.viewOnly
import com.intellij.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
import com.intellij.notebooks.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
class JupyterViewOnlyHandler : JupyterCefHttpHandlerBase(absolutePathFiles = listOf(
"/ipywidgets.html",

2
jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyProvider.kt
View File

@@ -8,7 +8,7 @@ import com.intellij.openapi.fileTypes.FileTypeRegistry
import com.intellij.openapi.project.DumbAware
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.jupyter.core.jupyter.JupyterFileType
import com.intellij.notebooks.jupyter.core.jupyter.JupyterFileType
internal class JupyterViewOnlyProvider : FileEditorProvider, DumbAware {
override fun accept(project: Project, file: VirtualFile): Boolean = FileTypeRegistry.getInstance().isFileOfType(file, JupyterFileType)

4
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
View File

@@ -71,9 +71,9 @@ class IntellijIconClassGeneratorConfig : IconClasses() {
iconDirectory = "icons/com/jetbrains/localization",
)
"intellij.jupyter.core"-> IntellijIconClassGeneratorModuleConfig(
"intellij.notebooks.jupyter.core"-> IntellijIconClassGeneratorModuleConfig(
className = "JupyterCoreIcons",
packageName = "com.intellij.jupyter.core.icons",
packageName = "com.intellij.notebooks.jupyter.core.icons",
iconDirectory = "icons/org.jetbrains.plugins.notebooks.jupyter",
)

4
plugins/ide-startup/importSettings/resources/pluginData/ds.json
View File

@@ -216,8 +216,8 @@
},
{
"vsCodeId": "ms-toolsai.jupyter",
"ideaName": "Python Support for Jupyter",
"ideaId": "intellij.jupyter.py"
"ideaName": "Jupyter",
"ideaId": "intellij.jupyter"
},
{
"vsCodeId": "ms-vscode-remote.remote-containers",

4
plugins/ide-startup/importSettings/resources/pluginData/iu.json
View File

@@ -276,8 +276,8 @@
},
{
"vsCodeId": "ms-toolsai.jupyter",
"ideaName": "Python Support for Jupyter",
"ideaId": "intellij.jupyter.py"
"ideaName": "Jupyter",
"ideaId": "intellij.jupyter"
},
{
"vsCodeId": "ms-vscode-remote.remote-containers",

4
plugins/ide-startup/importSettings/resources/pluginData/pp.json
View File

@@ -251,8 +251,8 @@
},
{
"vsCodeId": "ms-toolsai.jupyter",
"ideaName": "Python Support for Jupyter",
"ideaId": "intellij.jupyter.py"
"ideaName": "Jupyter",
"ideaId": "intellij.jupyter"
},
{
"vsCodeId": "ms-vscode-remote.remote-containers",

2
python/testSrc/intellij.python.community.tests.iml
View File

@@ -43,7 +43,7 @@
<orderEntry type="module" module-name="intellij.python.markdown" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.notebooks.visualization" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.python.featuresTrainer" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.jupyter.core" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.notebooks.jupyter.core" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.grazie.tests" scope="TEST" />
<orderEntry type="module" module-name="intellij.python.grazie" />
<orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />