From 8f07b83138bcb8a98a031e4508080c849a735644 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 27 Jul 2021 03:25:52 +0300 Subject: [PATCH] Make DescriptorPreview.open more flexible GitOrigin-RevId: 0eab74ae2735519d69c813d5b0c82f17430f765c --- .../analysis/problemsView/toolWindow/ProblemsViewPanel.java | 4 +++- .../src/com/intellij/ui/preview/DescriptorPreview.kt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewPanel.java b/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewPanel.java index 90285e72df57..5c5e95b249ee 100644 --- a/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewPanel.java +++ b/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewPanel.java @@ -26,6 +26,7 @@ import com.intellij.ui.border.CustomLineBorder; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManager; import com.intellij.ui.preview.DescriptorPreview; +import com.intellij.ui.preview.DescriptorSupplier; import com.intellij.ui.tree.AsyncTreeModel; import com.intellij.ui.tree.RestoreSelectionListener; import com.intellij.ui.treeStructure.Tree; @@ -370,7 +371,8 @@ public class ProblemsViewPanel extends OnePixelSplitter implements Disposable, D } protected void updatePreview() { - myPreview.open(isNotNullAndSelected(getShowPreview()) ? getSelectedNode() : null); + DescriptorSupplier supplier = isNotNullAndSelected(getShowPreview()) ? getSelectedNode() : null; + myPreview.open(supplier == null ? null : supplier.getDescriptor()); } private void invokeLater(@NotNull Runnable runnable) { diff --git a/platform/lang-impl/src/com/intellij/ui/preview/DescriptorPreview.kt b/platform/lang-impl/src/com/intellij/ui/preview/DescriptorPreview.kt index c04025d90b89..82224ad3de87 100644 --- a/platform/lang-impl/src/com/intellij/ui/preview/DescriptorPreview.kt +++ b/platform/lang-impl/src/com/intellij/ui/preview/DescriptorPreview.kt @@ -21,8 +21,8 @@ class DescriptorPreview(val splitter: Splitter, val editable: Boolean, val id: C fun editor() = editor fun close() = open(null) - fun open(supplier: DescriptorSupplier?) { - this.descriptor = supplier?.descriptor + fun open(descriptor: OpenFileDescriptor?) { + this.descriptor = descriptor } private var editor: Editor? by observable(null) { _, oldEditor, newEditor ->