MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

[PyCharm] Jupyter/RemoteDev (fix): Removed obsolete OutputListener and OUTPUT_LISTENER: Topic<OutputListener>. #PY-76035 Fixed

Browse Source 
GitOrigin-RevId: 19a4465762389b53c0fd53445eb73005e661d047
This commit is contained in:
Nikita Pavlenko
2024-09-19 12:19:34 +02:00
committed by intellij-monorepo-bot
parent 08102c3721
commit a924f291c2
2 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
notebooks/visualization/src/com/intellij/notebooks/visualization/outputs/NotebookOutputInlayController.kt
View File

@@ -1,25 +1,14 @@
package com.intellij.notebooks.visualization.outputs package com.intellij.notebooks.visualization.outputs
import com.intellij.notebooks.visualization.outputs.impl.SurroundingComponent
import com.intellij.openapi.Disposable import com.intellij.openapi.Disposable
import com.intellij.openapi.components.Service import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.thisLogger import com.intellij.openapi.diagnostic.thisLogger
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.EditorCustomElementRenderer import com.intellij.openapi.editor.EditorCustomElementRenderer
import com.intellij.util.asSafely import com.intellij.util.asSafely
import com.intellij.util.messages.Topic
import com.intellij.notebooks.visualization.outputs.impl.SurroundingComponent
import javax.swing.JComponent import javax.swing.JComponent
// ToDo: merge with NotebookOutputListener
interface OutputListener {
fun beforeOutputCreated(editor: Editor, line: Int) {}
fun outputCreated(editor: Editor, line: Int) {}
fun outputSizeUpdated(editor: Editor, line: Int?) {}
}
val OUTPUT_LISTENER: Topic<OutputListener> = Topic.create("OutputAdded", OutputListener::class.java)
val EditorCustomElementRenderer.notebookInlayOutputComponent: JComponent? val EditorCustomElementRenderer.notebookInlayOutputComponent: JComponent?
get() = asSafely<JComponent>()?.components?.firstOrNull()?.asSafely<SurroundingComponent>() get() = asSafely<JComponent>()?.components?.firstOrNull()?.asSafely<SurroundingComponent>()

6
notebooks/visualization/src/com/intellij/notebooks/visualization/ui/EditorCellOutputs.kt
View File

@@ -8,7 +8,6 @@ import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFacto
import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFactory.Companion.gutterPainter import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFactory.Companion.gutterPainter
import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFactoryGetter import com.intellij.notebooks.visualization.outputs.NotebookOutputComponentFactoryGetter
import com.intellij.notebooks.visualization.outputs.NotebookOutputDataKey import com.intellij.notebooks.visualization.outputs.NotebookOutputDataKey
import com.intellij.notebooks.visualization.outputs.OUTPUT_LISTENER
import com.intellij.notebooks.visualization.outputs.impl.CollapsingComponent import com.intellij.notebooks.visualization.outputs.impl.CollapsingComponent
import com.intellij.notebooks.visualization.outputs.impl.InnerComponent import com.intellij.notebooks.visualization.outputs.impl.InnerComponent
import com.intellij.notebooks.visualization.outputs.impl.SurroundingComponent import com.intellij.notebooks.visualization.outputs.impl.SurroundingComponent
@@ -65,7 +64,7 @@ class EditorCellOutputs(
} }
private val outerComponent = SurroundingComponent.create(editor, innerComponent).also { private val outerComponent = SurroundingComponent.create(editor, innerComponent).also {
DataManager.registerDataProvider(it, NotebookCellDataProvider(editor, it, { cell.interval })) DataManager.registerDataProvider(it, NotebookCellDataProvider(editor, it) { cell.interval })
} }
internal var inlay: Inlay<*>? = null internal var inlay: Inlay<*>? = null
@@ -190,8 +189,6 @@ class EditorCellOutputs(
factory: NotebookOutputComponentFactory<*, K>, factory: NotebookOutputComponentFactory<*, K>,
outputDataKey: K, outputDataKey: K,
): NotebookOutputComponentFactory.CreatedComponent<*>? { ): NotebookOutputComponentFactory.CreatedComponent<*>? {
val lines = cell.interval.lines
ApplicationManager.getApplication().messageBus.syncPublisher(OUTPUT_LISTENER).beforeOutputCreated(editor, lines.last)
val result = try { val result = try {
factory.createComponent(editor, outputDataKey) factory.createComponent(editor, outputDataKey)
} }
@@ -210,7 +207,6 @@ class EditorCellOutputs(
Disposer.register(editor.disposable, disposable) Disposer.register(editor.disposable, disposable)
} }
} }
ApplicationManager.getApplication().messageBus.syncPublisher(OUTPUT_LISTENER).outputCreated(editor, lines.last)
return result return result
} }