From 5647640e44c668bb65938c2a7f802ac125fc6f46 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 7 Nov 2017 22:12:33 +0100 Subject: [PATCH] no getData for actions after console is disposed (EA-110448 - NPE: ConsoleViewImpl.foldImmediately) --- .../src/com/intellij/execution/impl/ConsoleViewImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java index 5dc6aba63afe..ee499bfba943 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java @@ -813,10 +813,10 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo @Override public Object getData(final String dataId) { + if (myEditor == null) { + return null; + } if (CommonDataKeys.NAVIGATABLE.is(dataId)) { - if (myEditor == null) { - return null; - } final LogicalPosition pos = myEditor.getCaretModel().getLogicalPosition(); final HyperlinkInfo info = myHyperlinks.getHyperlinkInfoByLineAndCol(pos.line, pos.column); final OpenFileDescriptor openFileDescriptor = info instanceof FileHyperlinkInfo ? ((FileHyperlinkInfo)info).getDescriptor() : null;