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

AddMethodQualifierFix prevent IOOBE in getText()

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-07-01 19:01:31 +03:00
parent da233c8f3d
commit 577ace5bb2
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java
+9 -6
View File
@@ -51,8 +51,11 @@ public class AddMethodQualifierFix implements IntentionAction {
@Override
public String getText() {
final List<PsiVariable> candidates = getOrFindCandidates();
if (candidates.isEmpty()) {
return getFamilyName();
}
String text = QuickFixBundle.message("add.method.qualifier.fix.text", candidates.size() > 1 ? "" : candidates.get(0).getName());
if (myCandidates.size() > 1) {
if (candidates.size() > 1) {
text += "...";
}
return text;
@@ -61,7 +64,7 @@ public class AddMethodQualifierFix implements IntentionAction {
@NotNull
@Override
public String getFamilyName() {
return getText();
return QuickFixBundle.message("add.method.qualifier.fix.family");
}
@Override
@@ -108,7 +111,7 @@ public class AddMethodQualifierFix implements IntentionAction {
@TestOnly
public List<PsiVariable> getCandidates() {
return myCandidates;
return getOrFindCandidates();
}
@Override
@@ -116,8 +119,8 @@ public class AddMethodQualifierFix implements IntentionAction {
if (!FileModificationService.getInstance().preparePsiElementsForWrite(file)) {
return;
}
if (myCandidates.size() == 1 || UNIT_TEST_MODE) {
qualify(myCandidates.get(0), editor);
if (getOrFindCandidates().size() == 1 || UNIT_TEST_MODE) {
qualify(getOrFindCandidates().get(0), editor);
}
else {
chooseAndQualify(editor);
@@ -126,7 +129,7 @@ public class AddMethodQualifierFix implements IntentionAction {
private void chooseAndQualify(final Editor editor) {
final BaseListPopupStep<PsiVariable> step =
new BaseListPopupStep<PsiVariable>(QuickFixBundle.message("add.qualifier"), myCandidates) {
new BaseListPopupStep<PsiVariable>(QuickFixBundle.message("add.qualifier"), getOrFindCandidates()) {
@Override
public PopupStep onChosen(final PsiVariable selectedValue, final boolean finalChoice) {
if (selectedValue != null && finalChoice) {