Do not skip blocks outside of formatting range, when building block wrappers. Blocks with alignments will be built and in some cases aligned properly.

Removed FieldInColumnsPreFormatProcessor, because now using CodeStyleManager#reformatWithContext we can reformat not only selected fragment, but also all blocks with alignments found there. (Also it fixes IDEA-99343)

Corrected test data

java/java-impl/src/com/intellij/psi/impl/source/codeStyle/FieldInColumnsPreFormatProcessor.java

@@ -1,120 +0,0 @@
-/*
- * Copyright 2000-2012 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.psi.impl.source.codeStyle;
-
-import com.intellij.lang.ASTNode;
-import com.intellij.lang.java.JavaLanguage;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiField;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
-import com.intellij.psi.impl.source.tree.ElementType;
-import com.intellij.psi.impl.source.tree.JavaJspElementType;
-import com.intellij.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * There is a possible case that the project is configured to keep fields in columns:
- * <pre>
- *   class Test {
- *     int i                 = 1;
- *     int fieldWithLongName = 2;
- *   }
- * </pre>
- * Suppose that one of the fields is renamed. We want to reformat the whole fields group then in order to keep that 'field columns'.
- * <p/>
- * Current extension checks if given range intersects with a field from a field group and expands its boundaries to contain
- * the whole group.
- * <p/>
- * Thread-safe.
- * 
- * @author Denis Zhdanov
- * @since 5/9/12 4:54 PM
- */
-public class FieldInColumnsPreFormatProcessor implements PreFormatProcessor {
-
-  @NotNull
-  @Override
-  public TextRange process(@NotNull ASTNode element, @NotNull TextRange range) {
-    //region Checking that everything is ready to expand the range for the 'fields in columns'.
-    final PsiElement psi = element.getPsi();
-    if (psi == null || !psi.isValid()) {
-      return range;
-    }
-
-    final PsiFile file = psi.getContainingFile();
-    if (file == null) {
-      return range;
-    }
-    
-    final Project project = psi.getProject();
-    final CommonCodeStyleSettings settings
-      = CodeStyleSettingsManager.getInstance(project).getCurrentSettings().getCommonSettings(JavaLanguage.INSTANCE);
-    if (!settings.ALIGN_GROUP_FIELD_DECLARATIONS) {
-      return range;
-    }
-
-    final PsiElement startElement = file.findElementAt(range.getStartOffset());
-    if (startElement == null) {
-      return range;
-    }
-
-    final PsiField parent = PsiTreeUtil.getParentOfType(startElement, PsiField.class);
-    if (parent == null) {
-      return range;
-    }
-    //endregion
-
-    //region Calculating start offset to use by the start offset of the first sibling white space or field to the left of the current field.
-    int startToUse = range.getStartOffset();
-    for (PsiElement f = parent; f != null; f = f.getPrevSibling()) {
-      final ASTNode node = f.getNode();
-      if (node == null) {
-        break;
-      }
-      if (JavaJspElementType.WHITE_SPACE_BIT_SET.contains(node.getElementType()) || f instanceof PsiField) {
-        startToUse = f.getTextRange().getStartOffset();
-      }
-      else if (!ElementType.JAVA_COMMENT_BIT_SET.contains(node.getElementType())) {
-        break;
-      }
-    }
-    //endregion
-
-    //region Calculating end offset to use by the end offset of the last field in a group located to the right of the current field.
-    int endToUse = range.getEndOffset();
-    for (PsiElement f = parent; f != null; f = f.getNextSibling()) {
-      final ASTNode node = f.getNode();
-      if (node == null) {
-        break;
-      }
-      if (f instanceof PsiField) {
-        endToUse = f.getTextRange().getEndOffset();
-      }
-      else if (!JavaJspElementType.WHITE_SPACE_BIT_SET.contains(node.getElementType()) &&
-               !ElementType.JAVA_COMMENT_BIT_SET.contains(node.getElementType()))
-      {
-        break;
-      }
-    }
-    //endregion
-    
-    return TextRange.from(startToUse, endToUse);
-  }
-}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createFieldFromUsage/afterWithAlignment.java

@@ -1,7 +1,7 @@
 // "Create field 'field'" "true"
 class A {
-    public static final String NOTIFICATION_ENABLED     = "NOTIFICATION_ENABLED";
-    public static final String NOTIFICATION_DEVICE_NAME = "NOTIFICATION_DEVICE_NAME";
+  public static final String NOTIFICATION_ENABLED     = "NOTIFICATION_ENABLED";
+  public static final String NOTIFICATION_DEVICE_NAME = "NOTIFICATION_DEVICE_NAME";
     public static String field;
 
     public static String getString(String key)

platform/lang-impl/src/com/intellij/formatting/InitialInfoBuilder.java

@@ -203,9 +203,6 @@ class InitialInfoBuilder {
       if (rootBlock instanceof ReadOnlyBlockInformationProvider) {
         myReadOnlyBlockInformationProvider = (ReadOnlyBlockInformationProvider)rootBlock;
       }
-      if (!isInsideFormattingRanges && !myCollectAlignmentsInsideFormattingRange) {
-        return processSimpleBlock(rootBlock, parent, true, index, parentBlock);
-      }
 
       final List<Block> subBlocks = rootBlock.getSubBlocks();
       if (subBlocks.isEmpty() || myReadOnlyBlockInformationProvider != null

resources/src/META-INF/IdeaPlugin.xml

@@ -1179,7 +1179,6 @@
     <elementSignatureProvider implementation="com.intellij.codeInsight.folding.impl.JavaElementSignatureProvider"/>
 
     <preFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.FormatCommentsProcessor"/>
-    <preFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.FieldInColumnsPreFormatProcessor"/>
     <postFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.BracePostFormatProcessor"/>
     <postFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.ImportPostFormatProcessor"/>
     <postFormatProcessor implementation="com.intellij.psi.impl.source.codeStyle.TabPostFormatProcessor"/>