MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

RearrangeCodeProcessor: removed unused parameter

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2014-12-22 21:55:55 +02:00
parent 8c8d63a496
commit 8e5bf0aa2e
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/actions/RearrangeCodeProcessor.java
+1 -10
View File
@@ -40,13 +40,10 @@ public class RearrangeCodeProcessor extends AbstractLayoutCodeProcessor {
public static final String COMMAND_NAME = "Rearrange code";
public static final String PROGRESS_TEXT = "Rearranging code...";
@Nullable private Condition<PsiFile> myAcceptCondition;
@Nullable private SelectionModel mySelectionModel;
public RearrangeCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor,
@Nullable Condition<PsiFile> acceptCondition) {
public RearrangeCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor) {
super(previousProcessor, COMMAND_NAME, PROGRESS_TEXT);
myAcceptCondition = acceptCondition;
}
public RearrangeCodeProcessor(@NotNull Project project,
@@ -63,18 +60,12 @@ public class RearrangeCodeProcessor extends AbstractLayoutCodeProcessor {
super(project, files, PROGRESS_TEXT, commandName, postRunnable, false);
}
public boolean shouldRearrangeFile(@NotNull PsiFile file) {
return myAcceptCondition == null || myAcceptCondition.value(file);
}
@NotNull
@Override
protected FutureTask<Boolean> prepareTask(@NotNull final PsiFile file, final boolean processChangedTextOnly) {
return new FutureTask<Boolean>(new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
if (!shouldRearrangeFile(file)) return true;
Collection<TextRange> ranges = processChangedTextOnly ? FormatChangedTextUtil.getChangedTextRanges(myProject, file)
: getRangesToFormat(file);
platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+4 -4
View File
@@ -103,7 +103,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
processor = new OptimizeImportsProcessor(processor);
}
if (selectedFlags.isRearrangeEntries()) {
processor = new RearrangeCodeProcessor(processor, null);
processor = new RearrangeCodeProcessor(processor);
}
processor.run();
@@ -193,7 +193,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
}
if (rearrangeEntries && editor != null) {
processor = new RearrangeCodeProcessor(processor, null);
processor = new RearrangeCodeProcessor(processor);
}
processor.run();
@@ -249,7 +249,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
processor = new OptimizeImportsProcessor(processor);
}
if (options.isRearrangeEntries()) {
processor = new RearrangeCodeProcessor(processor, null);
processor = new RearrangeCodeProcessor(processor);
}
processor.run();
@@ -276,7 +276,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
}
if (selectedFlags.isRearrangeEntries()) {
processor = new RearrangeCodeProcessor(processor, null);
processor = new RearrangeCodeProcessor(processor);
}
processor.run();
platform/platform-tests/testSrc/com/intellij/codeInsight/actions/ReformatFilesWithFiltersTest.java
+1 -5
View File
@@ -1,8 +1,6 @@
package com.intellij.codeInsight.actions;
import com.intellij.lang.LanguageFormatting;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.PlainTextLanguage;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiFile;
@@ -11,13 +9,11 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.SearchScope;
import com.intellij.testFramework.LightPlatformTestCase;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.picocontainer.MutablePicoContainer;
import java.io.IOException;
import java.util.Collection;
import java.util.Set;
import static com.intellij.psi.search.GlobalSearchScopesCore.directoryScope;
@@ -246,7 +242,7 @@ public class ReformatFilesWithFiltersTest extends LightPlatformTestCase {
AbstractLayoutCodeProcessor processor = new ReformatCodeProcessor(getProject(), directory, true, false);
ReformatCodeAction.registerScopeFilter(processor, scope);
processor = new RearrangeCodeProcessor(processor, null);
processor = new RearrangeCodeProcessor(processor);
processor.run();
}