From 9c4314a68e6c222e1c2df67b48fc5434e3fbfb5c Mon Sep 17 00:00:00 2001 From: "Olga.Lavrichenko" Date: Mon, 29 Sep 2025 21:39:32 +0200 Subject: [PATCH] [Jupyter Cell Type] Move CellType to the notebook core module GitOrigin-RevId: a6b7a67ed2f1fa7e59d9e899ddaef4fa5af1a35e --- .../com/intellij/notebooks/jupyter/core/jupyter}/CellType.kt | 2 +- notebooks/visualization/BUILD.bazel | 2 ++ notebooks/visualization/intellij.notebooks.visualization.iml | 1 + .../resources/intellij.notebooks.visualization.xml | 1 + .../com/intellij/notebooks/visualization/NotebookCellLines.kt | 1 + .../intellij/notebooks/visualization/NotebookCellLinesLexer.kt | 1 + .../notebooks/visualization/NotebookVisualizationUiUtil.kt | 1 + .../action/NotebookOutputCollapseAllInSelectedCellsAction.kt | 2 +- .../src/com/intellij/notebooks/visualization/ui/EditorCell.kt | 2 +- .../com/intellij/notebooks/visualization/ui/EditorCellView.kt | 2 +- .../notebooks/visualization/ui/MarkdownCellsFloatingToolbar.kt | 2 +- .../ui/cell/background/CodeCellBackgroundControllerFactory.kt | 2 +- .../ui/cell/runCell/EditorCellRunGutterController.kt | 2 +- .../ui/cell/runCell/EditorCellRunGutterControllerFactory.kt | 2 +- .../ui/cell/toolbar/EditorCellActionsToolbarController.kt | 2 +- .../visualization/ui/providers/frame/EditorCellFrameManager.kt | 2 +- .../intellij/notebooks/visualization/CodeCellLinesChecker.kt | 1 + 17 files changed, 18 insertions(+), 10 deletions(-) rename {notebooks/visualization/src/com/intellij/notebooks/visualization => jupyter/src/com/intellij/notebooks/jupyter/core/jupyter}/CellType.kt (76%) diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/CellType.kt b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/CellType.kt similarity index 76% rename from notebooks/visualization/src/com/intellij/notebooks/visualization/CellType.kt rename to jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/CellType.kt index e31cb8df99ba..cdeacee4b8dd 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/CellType.kt +++ b/jupyter/src/com/intellij/notebooks/jupyter/core/jupyter/CellType.kt @@ -1,5 +1,5 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -package com.intellij.notebooks.visualization +package com.intellij.notebooks.jupyter.core.jupyter enum class CellType { CODE, MARKDOWN, RAW diff --git a/notebooks/visualization/BUILD.bazel b/notebooks/visualization/BUILD.bazel index 24f2d9ae1e6e..536b3f41b677 100644 --- a/notebooks/visualization/BUILD.bazel +++ b/notebooks/visualization/BUILD.bazel @@ -43,6 +43,7 @@ jvm_library( "//plugins/markdown/core:markdown", "//platform/util", "//platform/util/jdom", + "//jupyter:notebooks-jupyter-core", ] ) @@ -75,6 +76,7 @@ jvm_library( "//plugins/markdown/core:markdown", "//platform/util", "//platform/util/jdom", + "//jupyter:notebooks-jupyter-core", ] ) ### auto-generated section `build intellij.notebooks.visualization` end diff --git a/notebooks/visualization/intellij.notebooks.visualization.iml b/notebooks/visualization/intellij.notebooks.visualization.iml index b085c131a4c3..9947e32d0a78 100644 --- a/notebooks/visualization/intellij.notebooks.visualization.iml +++ b/notebooks/visualization/intellij.notebooks.visualization.iml @@ -53,5 +53,6 @@ + \ No newline at end of file diff --git a/notebooks/visualization/resources/intellij.notebooks.visualization.xml b/notebooks/visualization/resources/intellij.notebooks.visualization.xml index 80122b26a081..3d686ab37ddf 100644 --- a/notebooks/visualization/resources/intellij.notebooks.visualization.xml +++ b/notebooks/visualization/resources/intellij.notebooks.visualization.xml @@ -2,6 +2,7 @@ + diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLines.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLines.kt index 0f8be755cfba..ccfbcae35e44 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLines.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLines.kt @@ -1,6 +1,7 @@ package com.intellij.notebooks.visualization import com.intellij.lang.Language +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Editor import com.intellij.openapi.fileEditor.FileDocumentManager diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLinesLexer.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLinesLexer.kt index a3d979325a02..f3b4aa6d843b 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLinesLexer.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookCellLinesLexer.kt @@ -2,6 +2,7 @@ package com.intellij.notebooks.visualization import com.intellij.lang.Language import com.intellij.lexer.Lexer +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.visualization.NotebookCellLines.MarkersAtLines import com.intellij.openapi.editor.Document import com.intellij.util.keyFMap.KeyFMap diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookVisualizationUiUtil.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookVisualizationUiUtil.kt index 9144d82292cd..2252aed5ead5 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookVisualizationUiUtil.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/NotebookVisualizationUiUtil.kt @@ -1,5 +1,6 @@ package com.intellij.notebooks.visualization +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.visualization.NotebookCellLines.Companion.get import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Editor diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/action/NotebookOutputCollapseAllInSelectedCellsAction.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/action/NotebookOutputCollapseAllInSelectedCellsAction.kt index eddaf6348670..c043db1f6904 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/action/NotebookOutputCollapseAllInSelectedCellsAction.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/action/NotebookOutputCollapseAllInSelectedCellsAction.kt @@ -1,7 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.notebooks.visualization.outputs.action -import com.intellij.notebooks.visualization.CellType +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.visualization.NotebookCellInlayManager import com.intellij.notebooks.visualization.NotebookCellLines import com.intellij.notebooks.visualization.cellSelectionModel diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCell.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCell.kt index c6c900801935..e84f05a42cad 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCell.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCell.kt @@ -1,6 +1,6 @@ package com.intellij.notebooks.visualization.ui -import com.intellij.notebooks.visualization.CellType +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.visualization.NotebookCellInlayManager import com.intellij.notebooks.visualization.NotebookCellLines.Interval import com.intellij.notebooks.visualization.NotebookIntervalPointer diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellView.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellView.kt index ca632260e0d0..27f66daf1a22 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellView.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellView.kt @@ -1,7 +1,7 @@ package com.intellij.notebooks.visualization.ui +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.ui.bind -import com.intellij.notebooks.visualization.CellType import com.intellij.notebooks.visualization.UpdateContext import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedCellController import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedControllerFactory diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/MarkdownCellsFloatingToolbar.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/MarkdownCellsFloatingToolbar.kt index ec0fc6f791e8..4b73eaa9050b 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/MarkdownCellsFloatingToolbar.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/MarkdownCellsFloatingToolbar.kt @@ -2,7 +2,7 @@ package com.intellij.notebooks.visualization.ui import com.intellij.ide.ui.customization.CustomActionsSchema -import com.intellij.notebooks.visualization.CellType +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.visualization.NotebookCellLines import com.intellij.notebooks.visualization.getCells import com.intellij.notebooks.visualization.getSelectionLines diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/background/CodeCellBackgroundControllerFactory.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/background/CodeCellBackgroundControllerFactory.kt index bf5775fcb78f..5c6b0d5eb938 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/background/CodeCellBackgroundControllerFactory.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/background/CodeCellBackgroundControllerFactory.kt @@ -1,8 +1,8 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.notebooks.visualization.ui.cell.background +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.ui.visualization.NotebookUtil.isDiffKind -import com.intellij.notebooks.visualization.CellType import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedCellController import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedControllerFactory import com.intellij.notebooks.visualization.ui.EditorCell diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterController.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterController.kt index 76ceef6ee3c6..b4092158f745 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterController.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterController.kt @@ -2,8 +2,8 @@ package com.intellij.notebooks.visualization.ui.cell.runCell import com.intellij.icons.AllIcons +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.ui.afterDistinctChange -import com.intellij.notebooks.visualization.CellType import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedCellController import com.intellij.notebooks.visualization.ui.EditorCell import com.intellij.notebooks.visualization.ui.ProgressStatus diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterControllerFactory.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterControllerFactory.kt index 9e81d6bd1aaa..285af992b7de 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterControllerFactory.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/runCell/EditorCellRunGutterControllerFactory.kt @@ -1,9 +1,9 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.notebooks.visualization.ui.cell.runCell +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.ui.visualization.NotebookUtil.isOrdinaryNotebookEditor import com.intellij.notebooks.ui.visualization.NotebookUtil.notebookAppearance -import com.intellij.notebooks.visualization.CellType import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedCellController import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedControllerFactory import com.intellij.notebooks.visualization.ui.EditorCell diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/toolbar/EditorCellActionsToolbarController.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/toolbar/EditorCellActionsToolbarController.kt index c883efdb0a39..1aef9a3bbab8 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/toolbar/EditorCellActionsToolbarController.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/cell/toolbar/EditorCellActionsToolbarController.kt @@ -2,9 +2,9 @@ package com.intellij.notebooks.visualization.ui.cell.toolbar import com.intellij.ide.ui.customization.CustomActionsSchema +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.ui.afterDistinctChange import com.intellij.notebooks.ui.visualization.NotebookUtil.notebookAppearance -import com.intellij.notebooks.visualization.CellType import com.intellij.notebooks.visualization.NotebookVisualizationCoroutine import com.intellij.notebooks.visualization.controllers.selfUpdate.SelfManagedCellController import com.intellij.notebooks.visualization.ui.DataProviderComponent diff --git a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/providers/frame/EditorCellFrameManager.kt b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/providers/frame/EditorCellFrameManager.kt index 2bb146796bf0..3cd8d8184d0c 100644 --- a/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/providers/frame/EditorCellFrameManager.kt +++ b/notebooks/visualization/src/com/intellij/notebooks/visualization/ui/providers/frame/EditorCellFrameManager.kt @@ -1,9 +1,9 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.notebooks.visualization.ui.providers.frame +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.notebooks.ui.afterDistinctChange import com.intellij.notebooks.ui.visualization.NotebookUtil.notebookAppearance -import com.intellij.notebooks.visualization.CellType import com.intellij.notebooks.visualization.ui.EditorCell import com.intellij.notebooks.visualization.ui.notebookEditor import com.intellij.notebooks.visualization.ui.providers.bounds.JupyterBoundsChangeHandler diff --git a/notebooks/visualization/test/com/intellij/notebooks/visualization/CodeCellLinesChecker.kt b/notebooks/visualization/test/com/intellij/notebooks/visualization/CodeCellLinesChecker.kt index ac97127546ae..3d59470cc711 100644 --- a/notebooks/visualization/test/com/intellij/notebooks/visualization/CodeCellLinesChecker.kt +++ b/notebooks/visualization/test/com/intellij/notebooks/visualization/CodeCellLinesChecker.kt @@ -1,6 +1,7 @@ package com.intellij.notebooks.visualization import com.intellij.lang.Language +import com.intellij.notebooks.jupyter.core.jupyter.CellType import com.intellij.openapi.editor.impl.EditorImpl import com.intellij.util.keyFMap.KeyFMap import org.assertj.core.api.Assertions.assertThat