From dd0f5605f472f054ab7e14addea61d35db589580 Mon Sep 17 00:00:00 2001 From: Denis Zhdanov Date: Thu, 20 May 2010 15:02:05 +0400 Subject: [PATCH] EA-20331 - NPE: JavaSmartEnterProcessor.reformat Check for null is introduced --- .../editorActions/smartEnter/JavaSmartEnterProcessor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java index 2b458cb77466..8efc372f68be 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/JavaSmartEnterProcessor.java @@ -154,6 +154,9 @@ public class JavaSmartEnterProcessor extends SmartEnterProcessor { @Override protected void reformat(PsiElement atCaret) throws IncorrectOperationException { + if (atCaret == null) { + return; + } PsiElement parent = atCaret.getParent(); if (parent instanceof PsiCodeBlock) { final PsiCodeBlock block = (PsiCodeBlock) parent;