MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 05:21:29 +07:00
Code Issues Packages Projects Releases Wiki Activity

[DS-5033] suppress and log exceptions from NotebookCellInlayController.Factory

Browse Source 
GitOrigin-RevId: 674605496051ad433b57eb6ef255f2ceeadb38af
This commit is contained in:
Igor Slobodskov
2023-05-16 19:16:49 +02:00
committed by intellij-monorepo-bot
parent 4035a76654
commit ccb13e03e7
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
notebooks/visualization/src/org/jetbrains/plugins/notebooks/visualization/NotebookCellInlayManager.kt
View File

@@ -8,6 +8,7 @@ import com.intellij.openapi.actionSystem.PlatformCoreDataKeys
import com.intellij.openapi.actionSystem.PlatformDataKeys
import com.intellij.openapi.application.ApplicationManager
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.EditorKind
@@ -130,7 +131,7 @@ class NotebookCellInlayManager private constructor(val editor: EditorImpl) {
val factories = NotebookCellInlayController.Factory.EP_NAME.extensionList
for (interval in notebookCellLines.intervals) {
for (factory in factories) {
val controller = factory.compute(editor, emptyList(), notebookCellLines.intervals.listIterator(interval.ordinal))
val controller = failSafeCompute(factory, editor, emptyList(), notebookCellLines.intervals.listIterator(interval.ordinal))
if (controller != null) {
rememberController(controller, interval)
}
@@ -231,7 +232,7 @@ class NotebookCellInlayManager private constructor(val editor: EditorImpl) {
}
for ((factory, controllers) in seenControllersByFactory) {
val actualController = if (!editor.isDisposed) {
factory.compute(editor, controllers, notebookCellLines.intervals.listIterator(interval.ordinal))
failSafeCompute(factory, editor, controllers, notebookCellLines.intervals.listIterator(interval.ordinal))
}
else {
null
@@ -354,6 +355,19 @@ class NotebookCellInlayManager private constructor(val editor: EditorImpl) {
}
}
private fun failSafeCompute(factory: NotebookCellInlayController.Factory,
editor: EditorImpl,
controllers: Collection<NotebookCellInlayController>,
intervalIterator: ListIterator<NotebookCellLines.Interval>): NotebookCellInlayController? {
try {
return factory.compute(editor, controllers, intervalIterator)
}
catch (ex: Exception) {
thisLogger().error("NotebookCellInlayController.Factory shouldn't throw exceptions", ex)
return null
}
}
@TestOnly
fun getInlays(): MutableMap<Inlay<*>, NotebookCellInlayController> = inlays