Merge branch 'master' of git@git.labs.intellij.net:idea/community

This commit is contained in:
Eugene Kudelevsky
2010-05-20 15:09:13 +04:00
@@ -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;