From f0fb771128ab9840926ca9072b1566e7a1e23c22 Mon Sep 17 00:00:00 2001 From: Denis Zhdanov Date: Tue, 11 May 2010 15:56:47 +0400 Subject: [PATCH] IDEA-54765 Code Style -> Order of Members should have extra items for statics Refactoring-based class members manipulation is corrected --- .../intellij/psi/impl/source/tree/java/ClassElement.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java index 2355e79e895b..1fefd0c7d6f9 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/ClassElement.java @@ -407,7 +407,13 @@ public class ClassElement extends CompositeElement implements Constants { return nextSibling == null ? aClass.getLBrace().getNextSibling() : nextSibling; } else { - return aClass.getLBrace().getNextSibling(); + // The main idea is to avoid to anchor to 'white space' element because that causes reformatting algorithm + // to perform incorrectly. The algorithm is encapsulated at PostprocessReformattingAspect.doPostponedFormattingInner(). + PsiElement result = aClass.getLBrace().getNextSibling(); + while (result instanceof PsiWhiteSpace) { + result = result.getNextSibling(); + } + return result; } } lastMember = child;