From 401766daad95465f064c207e6b704d596e5751ee Mon Sep 17 00:00:00 2001 From: Gregory Shrago Date: Thu, 28 Oct 2010 23:15:32 +0400 Subject: [PATCH] possible NPE fix --- .../intellij/execution/console/LanguageConsoleImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java index 94bbf5de32b3..07032af12286 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java @@ -41,6 +41,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; +import com.intellij.openapi.fileEditor.impl.EditorWindow; import com.intellij.openapi.fileEditor.impl.FileDocumentManagerImpl; import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl; import com.intellij.openapi.fileTypes.FileType; @@ -156,7 +157,13 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider { myFullEditor = fileManager.openTextEditor(new OpenFileDescriptor(getProject(), virtualFile, 0), true); assert myFullEditor != null; configureFullEditor(); - fileManager.getCurrentWindow().setFilePinned(virtualFile, true); + EditorWindow editorWindow = EditorWindow.DATA_KEY.getData(DataManager.getInstance().getDataContext(myFullEditor.getComponent())); + if (editorWindow == null) { + editorWindow = fileManager.getCurrentWindow(); + } + if (editorWindow != null) { + editorWindow.setFilePinned(virtualFile, true); + } } }