From 3c714802b4334b345119a04e48613dc5bfe7f3d0 Mon Sep 17 00:00:00 2001
From: Alexander Koshevoy <Alexander.Koshevoy@jetbrains.com>
Date: Tue, 7 Aug 2018 21:53:26 +0300
Subject: [PATCH] PY-18029 Move the content of intellij.python.console module
 to intellij.python.community.impl and remove it

---
 .../python/PythonCommunityPluginModules.groovy |  1 -
 .../pycharm/PyCharmCommunityProperties.groovy  |  3 +--
 .../python/console/protocol/ArrayData.java     |  0
 .../python/console/protocol/ArrayHeaders.java  |  0
 .../python/console/protocol/ColHeader.java     |  0
 .../console/protocol/CompletionOption.java     |  0
 .../console/protocol/CompletionOptionType.java |  0
 .../python/console/protocol/DebugValue.java    |  0
 .../console/protocol/GetArrayResponse.java     |  0
 .../protocol/PythonConsoleBackendService.java  |  0
 .../protocol/PythonConsoleFrontendService.java |  0
 .../python/console/protocol/RowHeader.java     |  0
 .../UnsupportedArrayTypeException.java         |  0
 python/intellij.python.community.impl.iml      |  4 +++-
 .../python-console/intellij.python.console.iml | 18 ------------------
 .../python-console/thrift/console-compile.sh   |  3 ---
 .../console/transport/DirectedMessage.kt       |  0
 .../console/transport/DirectedMessageCodec.kt  |  0
 .../transport/DirectedMessageHandler.kt        |  0
 .../python/console/transport/README.md         |  0
 .../console/transport/TCumulativeTransport.kt  |  0
 .../transport/client/TNettyClientTransport.kt  |  0
 .../console/transport/server/TNettyServer.kt   |  0
 .../transport/server/TNettyServerTransport.kt  |  0
 python/thrift/console-compile.sh               |  3 +++
 25 files changed, 7 insertions(+), 25 deletions(-)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/ArrayData.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/ColHeader.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/CompletionOption.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/DebugValue.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/RowHeader.java (100%)
 rename python/{python-console => }/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java (100%)
 delete mode 100644 python/python-console/intellij.python.console.iml
 delete mode 100644 python/python-console/thrift/console-compile.sh
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/DirectedMessage.kt (100%)
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/DirectedMessageCodec.kt (100%)
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/DirectedMessageHandler.kt (100%)
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/README.md (100%)
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/TCumulativeTransport.kt (100%)
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/client/TNettyClientTransport.kt (100%)
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/server/TNettyServer.kt (100%)
 rename python/{python-console => }/src/com/jetbrains/python/console/transport/server/TNettyServerTransport.kt (100%)
 create mode 100644 python/thrift/console-compile.sh

diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
index 38bdf57f0428..c6e004f49c94 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy
@@ -19,7 +19,6 @@ class PythonCommunityPluginModules {
     "intellij.python.psi",
     "intellij.python.pydev",
     "intellij.python.community.impl",
-    "intellij.python.console",
   ]
   public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "intellij.python.community.plugin.resources"
   static final List<String> PYCHARM_ONLY_PLUGIN_MODULES = [
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 18ca7dd539d9..aa9546310cc6 100644
--- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
+++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PyCharmCommunityProperties.groovy
@@ -30,8 +30,7 @@ class PyCharmCommunityProperties extends PyCharmPropertiesBase {
     productLayout.platformApiModules = CommunityRepositoryModules.PLATFORM_API_MODULES + ["intellij.xml.dom"]
     productLayout.platformImplementationModules = CommunityRepositoryModules.PLATFORM_IMPLEMENTATION_MODULES + [
       "intellij.xml.dom.impl", "intellij.python.community.impl", "intellij.pycharm.community.resources",
-      "intellij.pycharm.community", "intellij.python.configure", "intellij.python.community", "intellij.python.psi", "intellij.platform.main",
-      "intellij.python.console"
+      "intellij.pycharm.community", "intellij.python.configure", "intellij.python.community", "intellij.python.psi", "intellij.platform.main"
     ]
     productLayout.bundledPluginModules = new File("$communityHome/python/build/plugin-list.txt").readLines()
     productLayout.mainModules = ["intellij.pycharm.community.main"]
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/ArrayData.java b/python/gen/com/jetbrains/python/console/protocol/ArrayData.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/ArrayData.java
rename to python/gen/com/jetbrains/python/console/protocol/ArrayData.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java b/python/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java
rename to python/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/ColHeader.java b/python/gen/com/jetbrains/python/console/protocol/ColHeader.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/ColHeader.java
rename to python/gen/com/jetbrains/python/console/protocol/ColHeader.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/CompletionOption.java b/python/gen/com/jetbrains/python/console/protocol/CompletionOption.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/CompletionOption.java
rename to python/gen/com/jetbrains/python/console/protocol/CompletionOption.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java b/python/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java
rename to python/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/DebugValue.java b/python/gen/com/jetbrains/python/console/protocol/DebugValue.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/DebugValue.java
rename to python/gen/com/jetbrains/python/console/protocol/DebugValue.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java b/python/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java
rename to python/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java b/python/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java
rename to python/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java b/python/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java
rename to python/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/RowHeader.java b/python/gen/com/jetbrains/python/console/protocol/RowHeader.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/RowHeader.java
rename to python/gen/com/jetbrains/python/console/protocol/RowHeader.java
diff --git a/python/python-console/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java b/python/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java
similarity index 100%
rename from python/python-console/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java
rename to python/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index d5b4a6996c06..092e5869dafc 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -37,7 +37,9 @@
     </orderEntry>
     <orderEntry type="library" name="XStream" level="project" />
     <orderEntry type="module" module-name="intellij.python.helpers" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.python.console" />
     <orderEntry type="library" name="libthrift" level="project" />
+    <orderEntry type="library" name="Slf4j" level="project" />
+    <orderEntry type="library" name="netty-handler" level="project" />
+    <orderEntry type="library" name="netty-codec-http" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/python-console/intellij.python.console.iml b/python/python-console/intellij.python.console.iml
deleted file mode 100644
index 8abc3bf3179a..000000000000
--- a/python/python-console/intellij.python.console.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="library" name="libthrift" level="project" />
-    <orderEntry type="library" name="netty-codec-http" level="project" />
-    <orderEntry type="library" name="netty-handler" level="project" />
-    <orderEntry type="library" name="Slf4j" level="project" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/python/python-console/thrift/console-compile.sh b/python/python-console/thrift/console-compile.sh
deleted file mode 100644
index 2856789b0b83..000000000000
--- a/python/python-console/thrift/console-compile.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-thrift -r -out ../gen --gen java ../../../../community/python/helpers/pydev/pydev_console/console.thrift
\ No newline at end of file
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/DirectedMessage.kt b/python/src/com/jetbrains/python/console/transport/DirectedMessage.kt
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/DirectedMessage.kt
rename to python/src/com/jetbrains/python/console/transport/DirectedMessage.kt
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/DirectedMessageCodec.kt b/python/src/com/jetbrains/python/console/transport/DirectedMessageCodec.kt
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/DirectedMessageCodec.kt
rename to python/src/com/jetbrains/python/console/transport/DirectedMessageCodec.kt
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/DirectedMessageHandler.kt b/python/src/com/jetbrains/python/console/transport/DirectedMessageHandler.kt
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/DirectedMessageHandler.kt
rename to python/src/com/jetbrains/python/console/transport/DirectedMessageHandler.kt
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/README.md b/python/src/com/jetbrains/python/console/transport/README.md
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/README.md
rename to python/src/com/jetbrains/python/console/transport/README.md
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/TCumulativeTransport.kt b/python/src/com/jetbrains/python/console/transport/TCumulativeTransport.kt
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/TCumulativeTransport.kt
rename to python/src/com/jetbrains/python/console/transport/TCumulativeTransport.kt
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/client/TNettyClientTransport.kt b/python/src/com/jetbrains/python/console/transport/client/TNettyClientTransport.kt
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/client/TNettyClientTransport.kt
rename to python/src/com/jetbrains/python/console/transport/client/TNettyClientTransport.kt
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/server/TNettyServer.kt b/python/src/com/jetbrains/python/console/transport/server/TNettyServer.kt
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/server/TNettyServer.kt
rename to python/src/com/jetbrains/python/console/transport/server/TNettyServer.kt
diff --git a/python/python-console/src/com/jetbrains/python/console/transport/server/TNettyServerTransport.kt b/python/src/com/jetbrains/python/console/transport/server/TNettyServerTransport.kt
similarity index 100%
rename from python/python-console/src/com/jetbrains/python/console/transport/server/TNettyServerTransport.kt
rename to python/src/com/jetbrains/python/console/transport/server/TNettyServerTransport.kt
diff --git a/python/thrift/console-compile.sh b/python/thrift/console-compile.sh
new file mode 100644
index 000000000000..f24ed2ead5b5
--- /dev/null
+++ b/python/thrift/console-compile.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+thrift -r -out ../gen --gen java ../../../community/python/helpers/pydev/pydev_console/console.thrift
\ No newline at end of file