From fa4365d141522ecff7ab034630f0996329b5578f Mon Sep 17 00:00:00 2001
From: Vladimir Lagunov <vladimir.lagunov@jetbrains.com>
Date: Wed, 28 Jul 2021 15:33:27 +0700
Subject: [PATCH] PY-49957 Move intellij.visualisation from R Plugin directory
 to IntelliJ community

IJ-MR-12848

GitOrigin-RevId: 090aa447e093b6ffdcc3b04ee7c11d3a7148d53a
---
 .idea/modules.xml                             |  1 +
 .../build/IdeaCommunityProperties.groovy      |  2 +-
 .../intellij/build/NotebookProperties.groovy  | 12 ++++++++++
 .../intellij.java.ide.customization.iml       |  1 +
 .../visualization/intellij.visualisation.iml  | 23 +++++++++++++++++++
 .../resources-jps/META-INF/plugin.xml         |  6 -----
 ...isation.xml => intellij.visualisation.xml} |  7 +++---
 .../build/impl/PlatformModules.groovy         |  2 +-
 .../src/META-INF/PlatformLangPlugin.xml       |  4 ++++
 .../pycharm/PyCharmCommunityProperties.groovy |  2 +-
 python/intellij.pycharm.community.iml         |  1 +
 11 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 build/groovy/org/jetbrains/intellij/build/NotebookProperties.groovy
 create mode 100644 notebooks/visualization/intellij.visualisation.iml
 delete mode 100644 notebooks/visualization/resources-jps/META-INF/plugin.xml
 rename notebooks/visualization/resources/{META-INF/visualisation.xml => intellij.visualisation.xml} (97%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 724ea69bb8d4..4fadd4309966 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -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" />
diff --git a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
index 690dc3c1ad4c..23ba08468454 100644
--- a/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/IdeaCommunityProperties.groovy
@@ -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
diff --git a/build/groovy/org/jetbrains/intellij/build/NotebookProperties.groovy b/build/groovy/org/jetbrains/intellij/build/NotebookProperties.groovy
new file mode 100644
index 000000000000..7d693da4c122
--- /dev/null
+++ b/build/groovy/org/jetbrains/intellij/build/NotebookProperties.groovy
@@ -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",
+  ]
+}
diff --git a/java/ide-customization/intellij.java.ide.customization.iml b/java/ide-customization/intellij.java.ide.customization.iml
index 6db09bd7a9f8..6f0993f079ae 100644
--- a/java/ide-customization/intellij.java.ide.customization.iml
+++ b/java/ide-customization/intellij.java.ide.customization.iml
@@ -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>
\ No newline at end of file
diff --git a/notebooks/visualization/intellij.visualisation.iml b/notebooks/visualization/intellij.visualisation.iml
new file mode 100644
index 000000000000..52ae855fc058
--- /dev/null
+++ b/notebooks/visualization/intellij.visualisation.iml
@@ -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>
\ No newline at end of file
diff --git a/notebooks/visualization/resources-jps/META-INF/plugin.xml b/notebooks/visualization/resources-jps/META-INF/plugin.xml
deleted file mode 100644
index ca41472d1331..000000000000
--- a/notebooks/visualization/resources-jps/META-INF/plugin.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/notebooks/visualization/resources/META-INF/visualisation.xml b/notebooks/visualization/resources/intellij.visualisation.xml
similarity index 97%
rename from notebooks/visualization/resources/META-INF/visualisation.xml
rename to notebooks/visualization/resources/intellij.visualisation.xml
index a8d4a1e0dfc7..129b5152b1b3 100644
--- a/notebooks/visualization/resources/META-INF/visualisation.xml
+++ b/notebooks/visualization/resources/intellij.visualisation.xml
@@ -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>
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformModules.groovy
index 73a888b6e985..ef91377d52ee 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/PlatformModules.groovy
@@ -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"
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 96eb6392bb6a..ed9af5660956 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -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>
diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
index 6debc75b2d10..1dda0bc205ed 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
@@ -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"
diff --git a/python/intellij.pycharm.community.iml b/python/intellij.pycharm.community.iml
index 2f461a824eff..42f90b90d685 100644
--- a/python/intellij.pycharm.community.iml
+++ b/python/intellij.pycharm.community.iml
@@ -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>
\ No newline at end of file