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

PY-49957 Move intellij.visualisation from R Plugin directory to IntelliJ community

Browse Source 
IJ-MR-12848

GitOrigin-RevId: 090aa447e093b6ffdcc3b04ee7c11d3a7148d53a
This commit is contained in:
Vladimir Lagunov
2021-08-16 06:32:49 +00:00
committed by intellij-monorepo-bot
parent 073023884a
commit fa4365d141
11 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/modules.xml
Generated
+1
View File
@@ -869,6 +869,7 @@
<module fileurl="file://$PROJECT_DIR$/plugins/hg4idea/intellij.vcs.hg.iml" filepath="$PROJECT_DIR$/plugins/hg4idea/intellij.vcs.hg.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/intellij.vcs.svn.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/intellij.vcs.svn.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/intellij.vcs.svn.tests.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/intellij.vcs.svn.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/notebooks/visualization/intellij.visualisation.iml" filepath="$PROJECT_DIR$/notebooks/visualization/intellij.visualisation.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/webp/intellij.webp.iml" filepath="$PROJECT_DIR$/plugins/webp/intellij.webp.iml" />
<module fileurl="file://$PROJECT_DIR$/xml/openapi/intellij.xml.iml" filepath="$PROJECT_DIR$/xml/openapi/intellij.xml.iml" />
<module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-api/intellij.xml.analysis.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-api/intellij.xml.analysis.iml" />
build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
+1 -1
View File
@@ -20,7 +20,7 @@ class IdeaCommunityProperties extends BaseIdeaProperties {
useSplash = true
buildCrossPlatformDistribution = true
productLayout.productImplementationModules = ["intellij.platform.main"]
productLayout.productImplementationModules = ["intellij.platform.main"] + NotebookProperties.NOTEBOOK_IMPLEMENTATION_MODULES
productLayout.additionalPlatformJars.put(BaseLayout.PLATFORM_JAR, "intellij.idea.community.resources")
productLayout.bundledPluginModules += BUNDLED_PLUGIN_MODULES
productLayout.prepareCustomPluginRepositoryForPublishedPlugins = false
build/groovy/org/jetbrains/intellij/build/NotebookProperties.groovy
+12
View File
@@ -0,0 +1,12 @@
// 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.intellij.build
import groovy.transform.CompileStatic
@CompileStatic
class NotebookProperties {
/** Common, language-agnostic modules for notebook support (like for Jupyter, or R Markdown). */
static final List<String> NOTEBOOK_IMPLEMENTATION_MODULES = [
"intellij.visualisation",
]
}
java/ide-customization/intellij.java.ide.customization.iml
+1
View File
@@ -16,5 +16,6 @@
<orderEntry type="module" module-name="intellij.java.ui" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.java.impl" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.platform.testRunner" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.visualisation" />
</component>
</module>
notebooks/visualization/intellij.visualisation.iml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<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$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kotlin-stdlib-jdk8" level="project" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="library" name="gson" level="project" />
<orderEntry type="module" module-name="intellij.platform.images" />
<orderEntry type="library" name="jcef" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="library" scope="TEST" name="assertJ" level="project" />
<orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.ide.util.io" />
</component>
</module>
notebooks/visualization/resources-jps/META-INF/plugin.xml
-6
View File
@@ -1,6 +0,0 @@
<idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude" allow-bundled-update="true" implementation-detail="true">
<name>Inlay Visualisation</name>
<id>org.intellij.datavis.r.inlays.visualisation</id>
<vendor>JetBrains</vendor>
<xi:include href="/META-INF/visualisation.xml" xpointer="xpointer(/idea-plugin/*)"/>
</idea-plugin>
notebooks/visualization/resources/META-INF/visualisation.xml → notebooks/visualization/resources/intellij.visualisation.xml
+3 -4
View File
@@ -1,4 +1,5 @@
<idea-plugin allow-bundled-update="true">
<idea-plugin>
<module value="org.intellij.datavis.r.inlays.visualisation" />
<depends>com.intellij.platform.images</depends>
<extensionPoints>
<extensionPoint qualifiedName="com.intellij.datavis.inlays.inlayDescriptorProvider"
@@ -40,7 +41,7 @@
dynamic="true"/>
</extensionPoints>
<actions>
<actions resource-bundle="messages.VisualizationBundle">
<group id="org.intellij.datavis.r.inlays.components.InlayOutputToolbarActions">
<action id="org.intellij.datavis.r.inlays.components.ClearOutputAction"
class="org.intellij.datavis.r.inlays.components.ClearOutputAction"
@@ -110,6 +111,4 @@
<notebookCellInlayController
implementation="org.jetbrains.plugins.notebooks.editor.outputs.NotebookOutputInlayController$Factory"/>
</extensions>
<resource-bundle>messages.VisualizationBundle</resource-bundle>
</idea-plugin>
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformModules.groovy
+1 -1
View File
@@ -105,7 +105,7 @@ final class PlatformModules {
"intellij.platform.credentialStore",
"intellij.platform.credentialStore.ui",
"intellij.platform.rd.community",
"intellij.platform.ml.impl"
"intellij.platform.ml.impl",
)
private static final String UTIL_JAR = "util.jar"
platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+4
View File
@@ -149,4 +149,8 @@
<xi:include href="/META-INF/ExternalSystem.xml">
<xi:fallback/>
</xi:include>
<xi:include href="intellij.visualisation.xml">
<xi:fallback/>
</xi:include>
</idea-plugin>
python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
+1 -1
View File
@@ -20,7 +20,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
productLayout.mainModules = ["intellij.pycharm.community.main"]
productLayout.productApiModules = ["intellij.xml.dom"]
productLayout.productImplementationModules = [
productLayout.productImplementationModules = NotebookProperties.NOTEBOOK_IMPLEMENTATION_MODULES + [
"intellij.xml.dom.impl",
"intellij.platform.main",
"intellij.pycharm.community"
python/intellij.pycharm.community.iml
+1
View File
@@ -17,5 +17,6 @@
<orderEntry type="library" name="Guava" level="project" />
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.python.featuresTrainer" scope="RUNTIME" />
<orderEntry type="module" module-name="intellij.visualisation" />
</component>
</module>