diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java index 4d6d6c179293..f8efc0da3110 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AccessStaticViaInstanceFix.java @@ -118,6 +118,8 @@ public class AccessStaticViaInstanceFix extends LocalQuickFixAndIntentionActionO if (hasSideEffects && !ApplicationManager.getApplication().isUnitTestMode()) { final TextAttributes attributes = EditorColorsManager.getInstance().getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES); final Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext()); + if (editor == null) + return false; HighlightManager.getInstance(project).addOccurrenceHighlights(editor, PsiUtilBase.toPsiElementArray(sideEffects), attributes, true, null); try {