missed optimize imports quick fix (IDEA-122234)

This commit is contained in:
Anna Kozlova
2014-03-17 14:14:44 +01:00
parent 9499ff4874
commit 8da91c3070
3 changed files with 5 additions and 5 deletions
@@ -227,7 +227,7 @@ public abstract class QuickFixFactory {
public abstract IntentionAction createCreateAnnotationMethodFromUsageFix(@NotNull PsiNameValuePair pair);
@NotNull
public abstract IntentionAction createOptimizeImportsFix();
public abstract IntentionAction createOptimizeImportsFix(boolean onTheFly);
public abstract void registerFixesForUnusedParameter(@NotNull PsiParameter parameter, @NotNull Object highlightInfo);
@@ -187,7 +187,7 @@ public class PostHighlightingPass extends ProgressableTextEditorHighlightingPass
private void optimizeImportsOnTheFly(@NotNull final Editor editor) {
if (myHasRedundantImports || myHasMissortedImports) {
IntentionAction optimizeImportsFix = QuickFixFactory.getInstance().createOptimizeImportsFix();
IntentionAction optimizeImportsFix = QuickFixFactory.getInstance().createOptimizeImportsFix(true);
if (optimizeImportsFix.isAvailable(myProject, editor, myFile) && myFile.isWritable()) {
optimizeImportsFix.invoke(myProject, editor, myFile);
}
@@ -793,7 +793,7 @@ public class PostHighlightingPass extends ProgressableTextEditorHighlightingPass
HighlightInfo.newHighlightInfo(JavaHighlightInfoTypes.UNUSED_IMPORT).range(importStatement).descriptionAndTooltip(description)
.create();
QuickFixAction.registerQuickFixAction(info, QuickFixFactory.getInstance().createOptimizeImportsFix(), unusedImportKey);
QuickFixAction.registerQuickFixAction(info, QuickFixFactory.getInstance().createOptimizeImportsFix(false), unusedImportKey);
QuickFixAction.registerQuickFixAction(info, QuickFixFactory.getInstance().createEnableOptimizeImportsOnTheFlyFix(), unusedImportKey);
myHasRedundantImports = true;
return info;
@@ -600,7 +600,7 @@ public class QuickFixFactoryImpl extends QuickFixFactory {
@NotNull
@Override
public IntentionAction createOptimizeImportsFix() {
public IntentionAction createOptimizeImportsFix(final boolean onTheFly) {
final OptimizeImportsFix fix = new OptimizeImportsFix();
return new IntentionAction() {
@@ -618,7 +618,7 @@ public class QuickFixFactoryImpl extends QuickFixFactory {
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
return timeToOptimizeImports(file) && fix.isAvailable(project, editor, file);
return (!onTheFly || timeToOptimizeImports(file)) && fix.isAvailable(project, editor, file);
}
@Override