Skip to content

Commit 4bd3f83

Browse files
committed
Fixing NPE in GenerifyFileFix.getText.
1 parent 27640b1 commit 4bd3f83

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package com.intellij.java.impl.codeInsight.daemon.impl.quickfix;
1717

1818
import com.intellij.java.impl.refactoring.actions.TypeCookAction;
19+
import consulo.annotation.access.RequiredReadAction;
1920
import consulo.application.Result;
2021
import consulo.codeEditor.Editor;
2122
import consulo.fileEditor.FileEditorManager;
@@ -30,10 +31,12 @@
3031
import consulo.language.psi.PsiManager;
3132
import consulo.localize.LocalizeValue;
3233
import consulo.project.Project;
34+
import consulo.ui.annotation.RequiredUIAccess;
3335
import jakarta.annotation.Nonnull;
3436

3537
public class GenerifyFileFix implements SyntheticIntentionAction, LocalQuickFix {
36-
private String myFileName;
38+
@Nonnull
39+
private String myFileName = "";
3740

3841
@Nonnull
3942
@Override
@@ -48,8 +51,9 @@ public LocalizeValue getName() {
4851
}
4952

5053
@Override
51-
public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescriptor descriptor) {
52-
final PsiElement element = descriptor.getPsiElement();
54+
@RequiredUIAccess
55+
public void applyFix(@Nonnull final Project project, @Nonnull ProblemDescriptor descriptor) {
56+
PsiElement element = descriptor.getPsiElement();
5357
if (element == null) {
5458
return;
5559
}
@@ -58,6 +62,7 @@ public void applyFix(@Nonnull final Project project, @Nonnull final ProblemDescr
5862
myFileName = file.getName();
5963
new WriteCommandAction(project) {
6064
@Override
65+
@RequiredUIAccess
6166
protected void run(Result result) throws Throwable {
6267
invoke(project, FileEditorManager.getInstance(project).getSelectedTextEditor(), file);
6368
}
@@ -66,6 +71,7 @@ protected void run(Result result) throws Throwable {
6671
}
6772

6873
@Override
74+
@RequiredReadAction
6975
public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) {
7076
if (file != null && file.isValid()) {
7177
myFileName = file.getName();
@@ -77,6 +83,7 @@ public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file
7783
}
7884

7985
@Override
86+
@RequiredUIAccess
8087
public void invoke(@Nonnull Project project, Editor editor, PsiFile file) {
8188
if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
8289
return;

0 commit comments

Comments
 (0)