KTNB-235, PY-64586: Split intellij.python.jupyter.tables and intellij.python.pydev

GitOrigin-RevId: e417ef93a7ad78672df99631f3053fe36b8c681b
2025-12-16 14:23:28 +07:00 · 2024-05-08 10:52:35 +03:00
parent 04f715635a
commit 36ec2d65b0
22 changed files with 62 additions and 30 deletions
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/PyFrameAccessor.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/PyFrameAccessor.java
@@ -10,12 +10,12 @@ import com.intellij.xdebugger.frame.XStackFrame;
 import com.intellij.xdebugger.frame.XValueChildrenList;
 import com.jetbrains.python.debugger.pydev.ProcessDebugger;
 import com.jetbrains.python.debugger.pydev.PyDebugCallback;
-import com.jetbrains.python.debugger.pydev.TableCommandType;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
-import com.jetbrains.python.debugger.pydev.tables.TableCommandParameters;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.notebooks.tables.TableCommandParameters;
+import com.intellij.notebooks.tables.TableCommandType;

 import java.util.List;

--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ClientModeMultiProcessDebugger.java
@@ -14,9 +14,10 @@ import com.jetbrains.python.console.pydev.PydevCompletionVariant;
 import com.jetbrains.python.debugger.*;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
-import com.jetbrains.python.debugger.pydev.tables.TableCommandParameters;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.notebooks.tables.TableCommandParameters;
+import com.intellij.notebooks.tables.TableCommandType;

 import java.io.IOException;
 import java.util.*;
@@ -112,7 +113,7 @@ public class ClientModeMultiProcessDebugger implements ProcessDebugger {

  @Override
  public boolean isConnected() {
-    return allDebuggers().stream().anyMatch(RemoteDebugger::isConnected);
+    return ContainerUtil.exists(allDebuggers(), RemoteDebugger::isConnected);
  }

  @Override
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java
@@ -16,9 +16,10 @@ import com.jetbrains.python.console.pydev.PydevCompletionVariant;
 import com.jetbrains.python.debugger.*;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
-import com.jetbrains.python.debugger.pydev.tables.TableCommandParameters;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.notebooks.tables.TableCommandParameters;
+import com.intellij.notebooks.tables.TableCommandType;

 import java.io.IOException;
 import java.io.PrintWriter;
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/ProcessDebugger.java
@@ -10,9 +10,10 @@ import com.jetbrains.python.console.pydev.PydevCompletionVariant;
 import com.jetbrains.python.debugger.*;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
-import com.jetbrains.python.debugger.pydev.tables.TableCommandParameters;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import com.intellij.notebooks.tables.TableCommandParameters;
+import com.intellij.notebooks.tables.TableCommandType;

 import java.util.Collection;
 import java.util.List;
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/RemoteDebugger.java
@@ -23,12 +23,13 @@ import com.jetbrains.python.debugger.*;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommand;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandBuilder;
 import com.jetbrains.python.debugger.pydev.dataviewer.DataViewerCommandResult;
-import com.jetbrains.python.debugger.pydev.tables.TableCommandParameters;
 import com.jetbrains.python.debugger.pydev.transport.ClientModeDebuggerTransport;
 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 java.net.ServerSocket;
 import java.security.SecureRandom;
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/TableCommand.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/TableCommand.kt
@@ -3,7 +3,8 @@ package com.jetbrains.python.debugger.pydev

 import com.intellij.util.asSafely
 import com.jetbrains.python.debugger.pydev.tables.PyDevCommandParameters
-import com.jetbrains.python.debugger.pydev.tables.TableCommandParameters
+import com.intellij.notebooks.tables.TableCommandParameters
+import com.intellij.notebooks.tables.TableCommandType

 class TableCommand(debugger: RemoteDebugger?,
                   threadId: String?,
@@ -11,9 +12,9 @@ class TableCommand(debugger: RemoteDebugger?,
                   private val initExpr: String,
                   private val commandType: TableCommandType,
                   private val tableCommandParameters: TableCommandParameters?) : AbstractFrameCommand<String?>(debugger,
-                                                                                                   CMD_TABLE_EXEC,
-                                                                                                   threadId,
-                                                                                                   frameId) {
+                                                                                                                CMD_TABLE_EXEC,
+                                                                                                                threadId,
+                                                                                                                frameId) {
  var commandResult: String? = null

  override fun buildPayload(payload: Payload) {
@@ -34,7 +35,3 @@ class TableCommand(debugger: RemoteDebugger?,
    commandResult = response.payload
  }
 }
-
-enum class TableCommandType {
-  DF_INFO, SLICE, DF_DESCRIBE
-}
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyDevCommandParameters.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyDevCommandParameters.kt
@@ -0,0 +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
+
+class PyDevCommandParameters(val start: Int, val end: Int) : TableCommandParameters
--- a/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyTableCommandOutput.kt
+++ b/python/pydevSrc/src/com/jetbrains/python/debugger/pydev/tables/PyTableCommandOutput.kt
@@ -1,10 +0,0 @@
-// Copyright 2000-2021 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.jetbrains.python.debugger.pydev.tables
-
-enum class CommandOutputType {
-  STREAM, DISPLAY
-}
-
-interface TableCommandParameters {}
-
-class PyDevCommandParameters(val start: Int, val end: Int) : TableCommandParameters