From 6a413c23f5f2ed72577765f5cdc6743ca18e7180 Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 27 Oct 2015 14:49:30 +0300 Subject: [PATCH] EA-74148 - IAE: XDebuggerEditorsProvider.createExpression --- .../xdebugger/impl/ui/XDebuggerExpressionComboBox.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java index b5b17c9b4b79..829796ef31ed 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerExpressionComboBox.java @@ -150,7 +150,11 @@ public class XDebuggerExpressionComboBox extends XDebuggerEditorBase { return (XExpression)value; } } - return getEditorsProvider().createExpression(getProject(), (Document)myEditor.getItem(), myExpression.getLanguage(), EvaluationMode.EXPRESSION); + Object document = myEditor.getItem(); + if (document != null) { //sometimes happens on Mac + return getEditorsProvider().createExpression(getProject(), (Document)document, myExpression.getLanguage(), EvaluationMode.EXPRESSION); + } + return myExpression; } @Override