MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[python] fix jupyter packages

Browse Source 
GitOrigin-RevId: 4e5f0656c7b83e3129f144dc4f5436bcf9883fd8
This commit is contained in:
Ilya.Kazakevich
2024-01-17 04:58:55 +00:00
committed by intellij-monorepo-bot
parent 87694ae89c
commit ee148eaba0
14 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jupyter/src/icons/JupyterCoreIcons.java → jupyter/gen/com/intellij/jupyter/core/icons/JupyterCoreIcons.java
+1 -1
View File
@@ -1,4 +1,4 @@
package icons;
package com.intellij.jupyter.core.icons;
import com.intellij.ui.IconManager;
import org.jetbrains.annotations.NotNull;
jupyter/intellij.jupyter.core.iml
+1
View File
@@ -5,6 +5,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
jupyter/resources/META-INF/jupyter-core.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<fileType name="Jupyter"
language="Jupyter"
extensions="ipynb"
implementationClass="org.jetbrains.plugins.notebooks.jupyter.JupyterFileType"
implementationClass="com.intellij.jupyter.core.jupyter.JupyterFileType"
fieldName="INSTANCE"/>
<iconMapper mappingFile="JupyterCoreIconMappings.json"/>
</extensions>
jupyter/src/org/jetbrains/plugins/notebooks/jupyter/JupyterFileType.kt → jupyter/src/com/intellij/jupyter/core/jupyter/JupyterFileType.kt
+2 -2
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 org.jetbrains.plugins.notebooks.jupyter
package com.intellij.jupyter.core.jupyter
import com.intellij.openapi.fileTypes.LanguageFileType
import com.intellij.openapi.vfs.CharsetToolkit
import com.intellij.openapi.vfs.VirtualFile
import icons.JupyterCoreIcons
import com.intellij.jupyter.core.icons.JupyterCoreIcons
import org.jetbrains.annotations.NonNls
import javax.swing.Icon
jupyter/src/org/jetbrains/plugins/notebooks/jupyter/JupyterLanguage.kt → jupyter/src/com/intellij/jupyter/core/jupyter/JupyterLanguage.kt
+2 -2
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 org.jetbrains.plugins.notebooks.jupyter
package com.intellij.jupyter.core.jupyter
import com.intellij.lang.Language
import com.intellij.openapi.fileTypes.FileType
import com.intellij.openapi.fileTypes.LanguageFileType
import org.jetbrains.plugins.notebooks.core.api.lang.NotebookLanguage
import com.intellij.jupyter.core.lang.NotebookLanguage
object JupyterLanguage : Language(NotebookLanguage, "Jupyter")
jupyter/src/org/jetbrains/plugins/notebooks/jupyter/JupyterPsiBundle.kt → jupyter/src/com/intellij/jupyter/core/jupyter/JupyterPsiBundle.kt
+1 -1
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 org.jetbrains.plugins.notebooks.jupyter
package com.intellij.jupyter.core.jupyter
import com.intellij.DynamicBundle
import org.jetbrains.annotations.Nls
jupyter/src/org/jetbrains/plugins/notebooks/jupyter/preview/JupyterCefHttpHandler.kt → jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterCefHttpHandler.kt
+1 -1
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 org.jetbrains.plugins.notebooks.jupyter.preview
package com.intellij.jupyter.core.jupyter.preview
import com.intellij.openapi.application.ApplicationManager
jupyter/src/org/jetbrains/plugins/notebooks/jupyter/preview/JupyterHttpUtils.kt → jupyter/src/com/intellij/jupyter/core/jupyter/preview/JupyterHttpUtils.kt
+1 -1
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 org.jetbrains.plugins.notebooks.jupyter.preview
package com.intellij.jupyter.core.jupyter.preview
import org.apache.http.client.utils.URIBuilder
import org.jetbrains.ide.BuiltInServerManager
jupyter/src/org/jetbrains/plugins/notebooks/core/api/lang/NotebookLanguage.kt → jupyter/src/com/intellij/jupyter/core/lang/NotebookLanguage.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.plugins.notebooks.core.api.lang
package com.intellij.jupyter.core.lang
import com.intellij.lang.Language
jupyter/viewOnly/resources/META-INF/jupyter-view-only.xml
+2 -2
View File
@@ -3,7 +3,7 @@
<xi:include href="/META-INF/jupyter-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
<extensions defaultExtensionNs="com.intellij">
<httpRequestHandler id="jupyter-view-only" implementation="org.jetbrains.plugins.notebooks.jupyter.preview.viewOnly.JupyterViewOnlyHandler"/>
<fileEditorProvider id="jupyter-view-only-provider" implementation="org.jetbrains.plugins.notebooks.jupyter.preview.viewOnly.JupyterViewOnlyProvider" fileType="Jupyter"/>
<httpRequestHandler id="jupyter-view-only" implementation="com.intellij.jupyter.viewOnly.JupyterViewOnlyHandler"/>
<fileEditorProvider id="jupyter-view-only-provider" implementation="com.intellij.jupyter.viewOnly.JupyterViewOnlyProvider" fileType="Jupyter"/>
</extensions>
</idea-plugin>
jupyter/viewOnly/src/org/jetbrains/plugins/notebooks/jupyter/preview/viewOnly/JupyterViewOnlyFileEditor.kt → jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyFileEditor.kt
+3 -4
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 org.jetbrains.plugins.notebooks.jupyter.preview.viewOnly
package com.intellij.jupyter.viewOnly
import com.intellij.ide.ui.LafManagerListener
@@ -17,13 +17,12 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.cancel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.launch
import org.cef.browser.CefBrowser
import org.cef.browser.CefFrame
import org.cef.handler.CefLoadHandlerAdapter
import org.jetbrains.plugins.notebooks.jupyter.preview.JupyterCefHttpHandlerBase
import org.jetbrains.plugins.notebooks.jupyter.preview.addPathSegment
import com.intellij.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
import com.intellij.jupyter.core.jupyter.preview.addPathSegment
import java.beans.PropertyChangeListener
import java.nio.ByteBuffer
import javax.swing.JComponent
jupyter/viewOnly/src/org/jetbrains/plugins/notebooks/jupyter/preview/viewOnly/JupyterViewOnlyHandler.kt → jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyHandler.kt
+2 -2
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 org.jetbrains.plugins.notebooks.jupyter.preview.viewOnly
package com.intellij.jupyter.viewOnly
import org.jetbrains.plugins.notebooks.jupyter.preview.JupyterCefHttpHandlerBase
import com.intellij.jupyter.core.jupyter.preview.JupyterCefHttpHandlerBase
class JupyterViewOnlyHandler : JupyterCefHttpHandlerBase(absolutePathFiles = listOf(
"/ipywidgets.html",
jupyter/viewOnly/src/org/jetbrains/plugins/notebooks/jupyter/preview/viewOnly/JupyterViewOnlyProvider.kt → jupyter/viewOnly/src/com/intellij/jupyter/viewOnly/JupyterViewOnlyProvider.kt
+2 -2
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 org.jetbrains.plugins.notebooks.jupyter.preview.viewOnly
package com.intellij.jupyter.viewOnly
import com.intellij.openapi.fileEditor.FileEditor
import com.intellij.openapi.fileEditor.FileEditorPolicy
@@ -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 org.jetbrains.plugins.notebooks.jupyter.JupyterFileType
import com.intellij.jupyter.core.jupyter.JupyterFileType
internal class JupyterViewOnlyProvider : FileEditorProvider, DumbAware {
override fun accept(project: Project, file: VirtualFile): Boolean = FileTypeRegistry.getInstance().isFileOfType(file, JupyterFileType)
platform/build-scripts/icons/src/org/jetbrains/intellij/build/images/IntellijIconClassGeneratorConfig.kt
+5
View File
@@ -67,6 +67,11 @@ class IntellijIconClassGeneratorConfig : IconClasses() {
iconDirectory = "icons/com/jetbrains/localization",
)
"intellij.jupyter.core"-> IntellijIconClassGeneratorModuleConfig(
className = "JupyterCoreIcons",
packageName = "com.intellij.jupyter.core.icons",
iconDirectory = "icons/org.jetbrains.plugins.notebooks.jupyter",
)
"intellij.spring.mvc.core" -> IntellijIconClassGeneratorModuleConfig(
className = "SpringMvcApiIcons",