Skip to content

Commit 2b8ad9e

Browse files
committed
Refactoring of GenerifyFileFix.
1 parent 4bd3f83 commit 2b8ad9e

1 file changed

Lines changed: 11 additions & 15 deletions

File tree

plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/GenerifyFileFix.java

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,10 @@
1717

1818
import com.intellij.java.impl.refactoring.actions.TypeCookAction;
1919
import consulo.annotation.access.RequiredReadAction;
20-
import consulo.application.Result;
2120
import consulo.codeEditor.Editor;
2221
import consulo.fileEditor.FileEditorManager;
2322
import consulo.java.analysis.impl.localize.JavaQuickFixLocalize;
2423
import consulo.language.editor.FileModificationService;
25-
import consulo.language.editor.WriteCommandAction;
2624
import consulo.language.editor.inspection.LocalQuickFix;
2725
import consulo.language.editor.inspection.ProblemDescriptor;
2826
import consulo.language.editor.intention.SyntheticIntentionAction;
@@ -32,16 +30,17 @@
3230
import consulo.localize.LocalizeValue;
3331
import consulo.project.Project;
3432
import consulo.ui.annotation.RequiredUIAccess;
33+
import consulo.undoRedo.CommandProcessor;
3534
import jakarta.annotation.Nonnull;
3635

3736
public class GenerifyFileFix implements SyntheticIntentionAction, LocalQuickFix {
3837
@Nonnull
39-
private String myFileName = "";
38+
private LocalizeValue myText = LocalizeValue.empty();
4039

4140
@Nonnull
4241
@Override
4342
public LocalizeValue getText() {
44-
return JavaQuickFixLocalize.generifyText(myFileName);
43+
return myText;
4544
}
4645

4746
@Nonnull
@@ -52,32 +51,29 @@ public LocalizeValue getName() {
5251

5352
@Override
5453
@RequiredUIAccess
55-
public void applyFix(@Nonnull final Project project, @Nonnull ProblemDescriptor descriptor) {
54+
public void applyFix(@Nonnull Project project, @Nonnull ProblemDescriptor descriptor) {
5655
PsiElement element = descriptor.getPsiElement();
5756
if (element == null) {
5857
return;
5958
}
60-
final PsiFile file = element.getContainingFile();
59+
PsiFile file = element.getContainingFile();
6160
if (isAvailable(project, null, file)) {
62-
myFileName = file.getName();
63-
new WriteCommandAction(project) {
64-
@Override
65-
@RequiredUIAccess
66-
protected void run(Result result) throws Throwable {
67-
invoke(project, FileEditorManager.getInstance(project).getSelectedTextEditor(), file);
68-
}
69-
}.execute();
61+
CommandProcessor.getInstance().newCommand()
62+
.project(project)
63+
.inWriteAction()
64+
.run(() -> invoke(project, FileEditorManager.getInstance(project).getSelectedTextEditor(), file));
7065
}
7166
}
7267

7368
@Override
7469
@RequiredReadAction
7570
public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
7671
if (file != null && file.isValid()) {
77-
myFileName = file.getName();
72+
myText = JavaQuickFixLocalize.generifyText(file.getName());
7873
return PsiManager.getInstance(project).isInProject(file);
7974
}
8075
else {
76+
myText = LocalizeValue.empty();
8177
return false;
8278
}
8379
}

0 commit comments

Comments
 (0)