Merge branch 'master' into no-reformat-dialog-on-reformat-code-action

Conflicts:
	platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
	platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
	platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java

diff --cc platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
index 3aee7c9f9d21a8d3026b5ad29095491fd7c389e9,03691d0749e05c971ee0980557e0d95dd58d8152..1a38026975af9dcc26318067786783dab0d92ef0
--- 1/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
--- 2/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/FormatChangedTextUtil.java
@@@ -54,9 -54,9 +54,11 @@@ import org.jetbrains.annotations.Nullab
  import java.util.*;
  
  public class FormatChangedTextUtil {
+   public static final Key<String> TEST_REVISION_CONTENT = Key.create("test.revision.content");
    private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.actions.FormatChangedTextUtil");
 +  protected static final Key<List<TextRange>> CHANGED_RANGES = Key.create("changed.ranges.since.last.revision");
 +
+ 
    private FormatChangedTextUtil() {
    }
  

diff --cc platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
index 3d949fe2a8b99896e07b5761544af61e5dd60ca8,4867d85abbd7e94f5afa105e24a5446890e9277a..f8ae0ac7869eced95d406cdda8f5dce9a97be29f
--- 1/platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
--- 2/platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
@@@ -47,15 -45,15 +47,25 @@@ public class RearrangeCodeProcessor ext
      super(previousProcessor, COMMAND_NAME, PROGRESS_TEXT);
    }
  
 +  public RearrangeCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor, @NotNull SelectionModel model) {
 +    super(previousProcessor, COMMAND_NAME, PROGRESS_TEXT);
 +    mySelectionModel = model;
 +  }
 +
 +  public RearrangeCodeProcessor(@NotNull PsiFile file,
 +                                @NotNull SelectionModel selectionModel)
 +  {
 +    super(file.getProject(), file, PROGRESS_TEXT, COMMAND_NAME, false);
++
+   public RearrangeCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor, @NotNull SelectionModel selectionModel) {
+     super(previousProcessor, COMMAND_NAME, PROGRESS_TEXT);
+     mySelectionModel = selectionModel;
+   }
+   
+   public RearrangeCodeProcessor(@NotNull Project project,
+                                 @NotNull PsiFile file,
+                                 @Nullable SelectionModel selectionModel) {
+     super(project, file, PROGRESS_TEXT, COMMAND_NAME, false);
      mySelectionModel = selectionModel;
    }
  

diff --cc platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
Simple merge

diff --cc platform/platform-resources/src/idea/LangActions.xml
Simple merge