From 69b94eb752f1274399d99210e2bda9e50b40f494 Mon Sep 17 00:00:00 2001 From: Bogdan Kirilenko Date: Mon, 18 Dec 2023 14:46:52 +0100 Subject: [PATCH] [jupyter] PY-20132 temporarily disabled jupyter outputs in the diff viewer GitOrigin-RevId: ea2e783e1c449712e2f868c08145a8013d0faa14 --- .../outputs/NotebookOutputInlayController.kt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/outputs/NotebookOutputInlayController.kt b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/outputs/NotebookOutputInlayController.kt index d1119b10f7f7..e5783314a834 100644 --- a/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/outputs/NotebookOutputInlayController.kt +++ b/notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/outputs/NotebookOutputInlayController.kt @@ -6,12 +6,10 @@ import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.diagnostic.thisLogger -import com.intellij.openapi.editor.Document -import com.intellij.openapi.editor.Editor -import com.intellij.openapi.editor.EditorCustomElementRenderer -import com.intellij.openapi.editor.Inlay +import com.intellij.openapi.editor.* import com.intellij.openapi.editor.impl.EditorImpl import com.intellij.openapi.util.Disposer +import com.intellij.openapi.util.registry.Registry import com.intellij.util.asSafely import com.intellij.util.messages.Topic import org.jetbrains.plugins.notebooks.ui.visualization.notebookAppearance @@ -252,6 +250,10 @@ class NotebookOutputInlayController private constructor( ): NotebookCellInlayController? { val interval = intervalIterator.next() if (interval.type != NotebookCellLines.CellType.CODE) return null + // temporarily disable for diff until it can be done properly, see PY-20132 + if (!Registry.`is`("jupyter.diff.viewer.output")) { + if (editor.editorKind == EditorKind.DIFF) return null + } val outputDataKeys = NotebookOutputDataKeyExtractor.EP_NAME.extensionList.asSequence()