From c20e9841360c9c72457f50671172fa73dbd5b795 Mon Sep 17 00:00:00 2001 From: Nikita Pavlenko Date: Mon, 28 Oct 2024 18:29:24 +0100 Subject: [PATCH] [PyCharm] PY-74366 Jupyter/RemoteDev (feat): Restored lookup, code completion for notebooks. Added editor mode synchronization via RPC. (cherry picked from commit 021bd0c3d5616fd8097d27ee692423672441c499) GitOrigin-RevId: 96548893bcd4cd7d50e5c8f78f7bc886d3217739 --- .../notebook-ui/intellij.notebooks.ui.iml | 26 +++++++++++++++++++ .../command/mode/NotebookEditorMode.kt | 5 ++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/notebooks/notebook-ui/intellij.notebooks.ui.iml b/notebooks/notebook-ui/intellij.notebooks.ui.iml index 480aa195baf5..b158b77d2319 100644 --- a/notebooks/notebook-ui/intellij.notebooks.ui.iml +++ b/notebooks/notebook-ui/intellij.notebooks.ui.iml @@ -1,5 +1,29 @@ + + + + + + + + + + + + + + + $KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar + + + + + + + + @@ -8,6 +32,8 @@ + + diff --git a/notebooks/notebook-ui/src/com/intellij/notebooks/ui/editor/actions/command/mode/NotebookEditorMode.kt b/notebooks/notebook-ui/src/com/intellij/notebooks/ui/editor/actions/command/mode/NotebookEditorMode.kt index 02ceca8970ee..fa9b62ba7be1 100644 --- a/notebooks/notebook-ui/src/com/intellij/notebooks/ui/editor/actions/command/mode/NotebookEditorMode.kt +++ b/notebooks/notebook-ui/src/com/intellij/notebooks/ui/editor/actions/command/mode/NotebookEditorMode.kt @@ -10,6 +10,7 @@ import com.intellij.ui.Gray import com.intellij.util.concurrency.ThreadingAssertions import com.intellij.util.concurrency.annotations.RequiresEdt import com.intellij.util.messages.Topic +import kotlinx.serialization.Serializable /** * The Jupyter Notebook has a modal user interface. @@ -20,6 +21,7 @@ import com.intellij.util.messages.Topic * Notebook Modal Editor * */ +@Serializable enum class NotebookEditorMode { EDIT, COMMAND @@ -62,5 +64,4 @@ fun Editor.setMode(mode: NotebookEditorMode) { } internal val INVISIBLE_CARET = CaretVisualAttributes(Gray.TRANSPARENT, - CaretVisualAttributes.Weight.NORMAL) - + CaretVisualAttributes.Weight.NORMAL) \ No newline at end of file