diff --git a/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookBelowCellDelimiterPanel.kt b/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookBelowCellDelimiterPanel.kt index e4b3bb9ac3ee..d09f17c9dc13 100644 --- a/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookBelowCellDelimiterPanel.kt +++ b/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookBelowCellDelimiterPanel.kt @@ -1,6 +1,7 @@ package com.intellij.notebooks.ui.visualization import com.intellij.icons.AllIcons +import com.intellij.notebooks.ui.visualization.NotebookEditorAppearanceUtils.isDiffKind import com.intellij.openapi.actionSystem.* import com.intellij.openapi.editor.ex.util.EditorUtil import com.intellij.openapi.editor.impl.EditorImpl @@ -130,7 +131,7 @@ class NotebookBelowCellDelimiterPanel( else -> null } } - val event = AnActionEvent.createFromAnAction(action, null, ActionPlaces.EDITOR_INLAY, dataContext) + val event = AnActionEvent.createEvent(action, dataContext, null, ActionPlaces.EDITOR_INLAY, ActionUiKind.NONE, null) action.actionPerformed(event) } } @@ -155,7 +156,10 @@ class NotebookBelowCellDelimiterPanel( fun updateExecutionStatus( @NlsSafe tooltipText: String?, executionCount: Int?, statusIcon: Icon?, @NlsSafe executionDurationText: String? ) { - val showStatus = isExecutionCountDefined(executionCount) || (tooltipText != null && statusIcon != AllIcons.General.GreenCheckmark) + + val showStatus = (isExecutionCountDefined(executionCount) || (tooltipText != null && statusIcon != AllIcons.General.GreenCheckmark)) + && !editor.isDiffKind() + if (showStatus) { getOrCreateExecutionLabel().apply { text = getExecutionLabelText(executionCount, executionDurationText) diff --git a/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookEditorAppearanceUtils.kt b/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookEditorAppearanceUtils.kt index 27b48cba47ac..796704335d96 100644 --- a/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookEditorAppearanceUtils.kt +++ b/notebooks/notebook-ui/src/com/intellij/notebooks/ui/visualization/NotebookEditorAppearanceUtils.kt @@ -9,14 +9,12 @@ object NotebookEditorAppearanceUtils { val JUPYTER_HISTORY_EDITOR_KEY = Key.create("JUPYTER_HISTORY_EDITOR_KEY") fun getJupyterCellSpacing(editor: Editor): Int = editor.getLineHeight() - fun EditorKind.isDiff(): Boolean = this === EditorKind.DIFF + fun Editor.isDiffKind(): Boolean = this.editorKind == EditorKind.DIFF fun Editor.isOrdinaryNotebookEditor() = when { this.editorKind != EditorKind.MAIN_EDITOR -> false this.getUserData(JUPYTER_HISTORY_EDITOR_KEY) == true -> false else -> true } - - } \ No newline at end of file