From 3f6407f38f0c9b1fea4e5a20f6d001bf626693cb Mon Sep 17 00:00:00 2001
From: Nikita Pavlenko <nikita.pavlenko@jetbrains.com>
Date: Tue, 21 May 2024 14:35:48 +0200
Subject: [PATCH]  [pycharm] DataView (fix): Moved invasive module
 intellij.notebooks.tables to a proper place. Dependencies cleanup. #CPP-38829
 Fixed

GitOrigin-RevId: 2b9226d765d8242d3eb37248b9542145a632f8c5
---
 .idea/modules.xml                                  |  1 -
 .../resources/META-INF/IdeaPlugin.xml              |  1 -
 intellij.idea.community.main.iml                   |  1 -
 notebooks/tables/intellij.notebooks.tables.iml     | 14 --------------
 .../tables/resources/intellij.notebooks.tables.xml |  2 --
 .../resources/META-INF/PyCharmCorePlugin.xml       |  1 -
 python/intellij.python.community.impl.iml          |  1 -
 python/intellij.python.pydev.iml                   |  1 -
 .../jetbrains/python/debugger/PyFrameAccessor.java |  4 ++--
 .../pydev/ClientModeMultiProcessDebugger.java      |  4 ++--
 .../debugger/pydev/MultiProcessDebugger.java       |  4 ++--
 .../python/debugger/pydev/ProcessDebugger.java     |  4 ++--
 .../python/debugger/pydev/RemoteDebugger.java      |  4 ++--
 .../python/debugger/pydev/TableCommand.kt          |  4 ++--
 .../pydev/tables/PyDevCommandParameters.kt         |  2 +-
 .../jetbrains/python}/tables/CommandOutputType.kt  |  2 +-
 .../python}/tables/TableCommandParameters.kt       |  2 +-
 .../jetbrains/python}/tables/TableCommandType.kt   |  2 +-
 .../python/console/PydevConsoleCommunication.java  |  4 ++--
 .../jetbrains/python/debugger/PyDebugProcess.java  |  4 ++--
 python/src/intellij.python.community.impl.xml      |  1 -
 21 files changed, 20 insertions(+), 43 deletions(-)
 delete mode 100644 notebooks/tables/intellij.notebooks.tables.iml
 delete mode 100644 notebooks/tables/resources/intellij.notebooks.tables.xml
 rename {notebooks/tables/src/com/intellij/notebooks => python/pydevSrc/src/com/jetbrains/python}/tables/CommandOutputType.kt (76%)
 rename {notebooks/tables/src/com/intellij/notebooks => python/pydevSrc/src/com/jetbrains/python}/tables/TableCommandParameters.kt (74%)
 rename {notebooks/tables/src/com/intellij/notebooks => python/pydevSrc/src/com/jetbrains/python}/tables/TableCommandType.kt (78%)

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 3c4bfedca73b..0c5456a6960e 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -595,7 +595,6 @@
       <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$/notebooks/tables/intellij.notebooks.tables.iml" filepath="$PROJECT_DIR$/notebooks/tables/intellij.notebooks.tables.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/package-search/intellij.packageSearch.iml" filepath="$PROJECT_DIR$/plugins/package-search/intellij.packageSearch.iml" />
diff --git a/community-resources/resources/META-INF/IdeaPlugin.xml b/community-resources/resources/META-INF/IdeaPlugin.xml
index c71c568a8b4d..ffeaf63b27f0 100644
--- a/community-resources/resources/META-INF/IdeaPlugin.xml
+++ b/community-resources/resources/META-INF/IdeaPlugin.xml
@@ -10,7 +10,6 @@
   <content>
     <module name="intellij.notebooks.visualization"/>
     <module name="intellij.notebooks.ui"/>
-    <module name="intellij.notebooks.tables"/>
     <module name="intellij.xml.xmlbeans"/>
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ml.embeddings"/>
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index fd55901bee82..bcdbb2d13d51 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -186,7 +186,6 @@
     <orderEntry type="module" module-name="intellij.toml" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.tracing.ide" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.notebooks.visualization" scope="RUNTIME" />
-    <orderEntry type="module" module-name="intellij.notebooks.tables" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.keymap.eclipse" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.keymap.visualStudio" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.keymap.netbeans" scope="RUNTIME" />
diff --git a/notebooks/tables/intellij.notebooks.tables.iml b/notebooks/tables/intellij.notebooks.tables.iml
deleted file mode 100644
index 21008657627b..000000000000
--- a/notebooks/tables/intellij.notebooks.tables.iml
+++ /dev/null
@@ -1,14 +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$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.platform.util" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/notebooks/tables/resources/intellij.notebooks.tables.xml b/notebooks/tables/resources/intellij.notebooks.tables.xml
deleted file mode 100644
index 8fc22c20cab4..000000000000
--- a/notebooks/tables/resources/intellij.notebooks.tables.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<idea-plugin package="com.intellij.notebooks.tables">
-</idea-plugin>
\ No newline at end of file
diff --git a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
index 622eb0e71c29..4af24ce16b03 100644
--- a/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
+++ b/python/ide-common/resources/META-INF/PyCharmCorePlugin.xml
@@ -6,7 +6,6 @@
   <content>
     <module name="intellij.notebooks.visualization"/>
     <module name="intellij.notebooks.ui"/>
-    <module name="intellij.notebooks.tables"/>
     <module name="intellij.platform.ide.newUiOnboarding"/>
     <module name="intellij.platform.ml.embeddings"/>
     <module name="intellij.ide.startup.importSettings"/>
diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml
index c63648867ce4..d6a496608cd6 100644
--- a/python/intellij.python.community.impl.iml
+++ b/python/intellij.python.community.impl.iml
@@ -148,6 +148,5 @@
     <orderEntry type="module" module-name="intellij.commandInterface" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.python.community.impl.huggingFace" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.python.syntax" />
-    <orderEntry type="module" module-name="intellij.notebooks.tables" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/intellij.python.pydev.iml b/python/intellij.python.pydev.iml
index 9246e0c38a9c..b95a3eb76eab 100644
--- a/python/intellij.python.pydev.iml
+++ b/python/intellij.python.pydev.iml
@@ -20,6 +20,5 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.platform.debugger.impl" />
     <orderEntry type="module" module-name="intellij.python.syntax.core" />
-    <orderEntry type="module" module-name="intellij.notebooks.tables" />
   </component>
 </module>
\ No newline at end of file
diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/PyFrameAccessor.java b/python/pydevSrc/src/com/jetbrains/python/debugger/PyFrameAccessor.java
index a990a3c1afe5..1ebd54e9b34b 100644
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/PyFrameAccessor.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/PyFrameAccessor.java
@@ -14,8 +14,8 @@ import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.notebooks.tables.TableCommandParameters;
-import com.intellij.notebooks.tables.TableCommandType;
+import com.jetbrains.python.tables.TableCommandParameters;
+import com.jetbrains.python.tables.TableCommandType;
 
 import java.util.List;
 
diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java
index f6832fc4cb2a..b8aa44f8043f 100644
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java
@@ -16,8 +16,8 @@ import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.notebooks.tables.TableCommandParameters;
-import com.intellij.notebooks.tables.TableCommandType;
+import com.jetbrains.python.tables.TableCommandParameters;
+import com.jetbrains.python.tables.TableCommandType;
 
 import java.io.IOException;
 import java.util.*;
diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
index ae2d3f37e066..193c9a5ce599 100644
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
@@ -18,8 +18,8 @@ import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.notebooks.tables.TableCommandParameters;
-import com.intellij.notebooks.tables.TableCommandType;
+import com.jetbrains.python.tables.TableCommandParameters;
+import com.jetbrains.python.tables.TableCommandType;
 
 import java.io.IOException;
 import java.io.PrintWriter;
diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ProcessDebugger.java b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
index 7b16925cfafb..b43e83b768ac 100644
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
@@ -12,8 +12,8 @@ import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.notebooks.tables.TableCommandParameters;
-import com.intellij.notebooks.tables.TableCommandType;
+import com.jetbrains.python.tables.TableCommandParameters;
+import com.jetbrains.python.tables.TableCommandType;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/RemoteDebugger.java b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
index 1bc9c7f1318c..77df7609bd23 100644
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
@@ -28,8 +28,8 @@ import com.jetbrains.python.debugger.pydev.transport.DebuggerTransport;
 import com.jetbrains.python.debugger.pydev.transport.ServerModeDebuggerTransport;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.notebooks.tables.TableCommandParameters;
-import com.intellij.notebooks.tables.TableCommandType;
+import com.jetbrains.python.tables.TableCommandParameters;
+import com.jetbrains.python.tables.TableCommandType;
 
 import java.net.ServerSocket;
 import java.security.SecureRandom;
diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/TableCommand.kt b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/TableCommand.kt
index 498f2fe22104..1ab340f73d49 100644
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/TableCommand.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/TableCommand.kt
@@ -3,8 +3,8 @@ package com.jetbrains.python.debugger.pydev
 
 import com.intellij.util.asSafely
 import com.jetbrains.python.debugger.pydev.tables.PyDevCommandParameters
-import com.intellij.notebooks.tables.TableCommandParameters
-import com.intellij.notebooks.tables.TableCommandType
+import com.jetbrains.python.tables.TableCommandParameters
+import com.jetbrains.python.tables.TableCommandType
 
 class TableCommand(debugger: RemoteDebugger?,
                    threadId: String?,
diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyDevCommandParameters.kt b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyDevCommandParameters.kt
index 979457c9f06f..7593a5c9955a 100644
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyDevCommandParameters.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyDevCommandParameters.kt
@@ -1,6 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package com.jetbrains.python.debugger.pydev.tables
 
-import com.intellij.notebooks.tables.TableCommandParameters
+import com.jetbrains.python.tables.TableCommandParameters
 
 class PyDevCommandParameters(val start: Int, val end: Int) : TableCommandParameters
diff --git a/notebooks/tables/src/com/intellij/notebooks/tables/CommandOutputType.kt b/python/pydevSrc/src/com/jetbrains/python/tables/CommandOutputType.kt
similarity index 76%
rename from notebooks/tables/src/com/intellij/notebooks/tables/CommandOutputType.kt
rename to python/pydevSrc/src/com/jetbrains/python/tables/CommandOutputType.kt
index 888f0480e143..27f0ccb28970 100644
--- a/notebooks/tables/src/com/intellij/notebooks/tables/CommandOutputType.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/tables/CommandOutputType.kt
@@ -1,4 +1,4 @@
-package com.intellij.notebooks.tables
+package com.jetbrains.python.tables
 
 import com.intellij.openapi.util.IntellijInternalApi
 
diff --git a/notebooks/tables/src/com/intellij/notebooks/tables/TableCommandParameters.kt b/python/pydevSrc/src/com/jetbrains/python/tables/TableCommandParameters.kt
similarity index 74%
rename from notebooks/tables/src/com/intellij/notebooks/tables/TableCommandParameters.kt
rename to python/pydevSrc/src/com/jetbrains/python/tables/TableCommandParameters.kt
index 51eb359f4f9b..6ec18a7276dc 100644
--- a/notebooks/tables/src/com/intellij/notebooks/tables/TableCommandParameters.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/tables/TableCommandParameters.kt
@@ -1,4 +1,4 @@
-package com.intellij.notebooks.tables
+package com.jetbrains.python.tables
 
 import com.intellij.openapi.util.IntellijInternalApi
 
diff --git a/notebooks/tables/src/com/intellij/notebooks/tables/TableCommandType.kt b/python/pydevSrc/src/com/jetbrains/python/tables/TableCommandType.kt
similarity index 78%
rename from notebooks/tables/src/com/intellij/notebooks/tables/TableCommandType.kt
rename to python/pydevSrc/src/com/jetbrains/python/tables/TableCommandType.kt
index e1c6e5eaa5cb..3768aff8f0c9 100644
--- a/notebooks/tables/src/com/intellij/notebooks/tables/TableCommandType.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/tables/TableCommandType.kt
@@ -1,4 +1,4 @@
-package com.intellij.notebooks.tables
+package com.jetbrains.python.tables
 
 import com.intellij.openapi.util.IntellijInternalApi
 
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
index 3c7b251a0463..92e43b0dd906 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java
@@ -46,8 +46,8 @@ import org.apache.thrift.TException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
-import com.intellij.notebooks.tables.TableCommandParameters;
-import com.intellij.notebooks.tables.TableCommandType;
+import com.jetbrains.python.tables.TableCommandParameters;
+import com.jetbrains.python.tables.TableCommandType;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
index d2ed5e3f9a83..7d78299d1e8b 100644
--- a/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
+++ b/python/src/com/jetbrains/python/debugger/PyDebugProcess.java
@@ -76,8 +76,8 @@ import com.jetbrains.python.testing.AbstractPythonTestRunConfiguration;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import com.intellij.notebooks.tables.TableCommandParameters;
-import com.intellij.notebooks.tables.TableCommandType;
+import com.jetbrains.python.tables.TableCommandParameters;
+import com.jetbrains.python.tables.TableCommandType;
 
 import java.io.IOException;
 import java.net.ServerSocket;
diff --git a/python/src/intellij.python.community.impl.xml b/python/src/intellij.python.community.impl.xml
index e6cb1886fed6..e755c407f329 100644
--- a/python/src/intellij.python.community.impl.xml
+++ b/python/src/intellij.python.community.impl.xml
@@ -5,7 +5,6 @@
     <plugin id="com.intellij.modules.platform"/>
     <plugin id="com.intellij.modules.lang"/>
     <plugin id="org.toml.lang"/>
-    <module name="intellij.notebooks.tables"/>
   </dependencies>
 
   <resource-bundle>messages.PyBundle</resource-bundle>