From 7baad4cfb383550a2e7b2bc2899b325bcdfadd07 Mon Sep 17 00:00:00 2001 From: Denis Zhdanov Date: Thu, 22 Apr 2010 16:25:01 +0400 Subject: [PATCH] IDEA-43962 Indentation error on deep nesting levels 1. Dummy methods are moved to the super class; 2. Green code policy is applied; --- .../com/intellij/psi/formatter/java/SimpleJavaBlock.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java index d3fab07cf9c8..354bdf1351da 100644 --- a/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java +++ b/java/java-impl/src/com/intellij/psi/formatter/java/SimpleJavaBlock.java @@ -70,7 +70,7 @@ public class SimpleJavaBlock extends AbstractJavaBlock { if (astNode != child && child != null) { offset = child.getTextRange().getStartOffset(); } - if (indent != null && !(myNode.getPsi() instanceof PsiFile) && child.getElementType() != ElementType.MODIFIER_LIST) { + if (indent != null && !(myNode.getPsi() instanceof PsiFile) && child != null && child.getElementType() != ElementType.MODIFIER_LIST) { indent = Indent.getContinuationIndent(); } //indent = FormatterEx.getInstance().getContinuationIndent(); @@ -107,10 +107,12 @@ public class SimpleJavaBlock extends AbstractJavaBlock { } } - protected Wrap getReservedWrap(final IElementType elementType) { + @Override + public Wrap getReservedWrap(final IElementType elementType) { return myReservedWrap.get(elementType); } + @Override protected void setReservedWrap(final Wrap reservedWrap, final IElementType operationType) { myReservedWrap.put(operationType, reservedWrap); }