Skip to content

Commit 0018776

Browse files
authored
Merge pull request #158 from unv-unv/ep-name-general-refactoring-8
Refactoring and localizing users of EP_NAME (part 8)
2 parents fc0868c + 774b074 commit 0018776

11 files changed

Lines changed: 2294 additions & 2245 deletions

File tree

java-analysis-api/src/main/java/com/intellij/java/analysis/codeInsight/intention/QuickFixFactory.java

Lines changed: 405 additions & 281 deletions
Large diffs are not rendered by default.

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ public static HighlightInfo checkElementInTypeParameterExtendsList(
398398
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
399399
.range(element)
400400
.descriptionAndTooltip(JavaErrorLocalize.interfaceExpected())
401-
.registerFix(QuickFixFactory.getInstance().createMoveBoundClassToFrontFix(aClass, type), null, null, null, null)
401+
.registerFix(QuickFixFactory.getInstance().createMoveBoundClassToFrontFix(aClass, type))
402402
.create();
403403
}
404404
else if (referenceElements.length != 0 && element != referenceElements[0]
@@ -408,7 +408,7 @@ else if (referenceElements.length != 0 && element != referenceElements[0]
408408
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
409409
.range(element)
410410
.descriptionAndTooltip(JavaErrorLocalize.typeParameterCannotBeFollowedByOtherBounds())
411-
.registerFix(QuickFixFactory.getInstance().createExtendsListFix(aClass, type, false), null, null, null, null)
411+
.registerFix(QuickFixFactory.getInstance().createExtendsListFix(aClass, type, false))
412412
.create();
413413
}
414414
return null;
@@ -598,7 +598,7 @@ public static HighlightInfo checkUnrelatedDefaultMethods(@Nonnull PsiClass aClas
598598
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
599599
.range(classIdentifier)
600600
.descriptionAndTooltip(message)
601-
.registerFix(QuickFixFactory.getInstance().createImplementMethodsFix(aClass), null, null, null, null)
601+
.registerFix(QuickFixFactory.getInstance().createImplementMethodsFix(aClass))
602602
.create();
603603
}
604604
if (isInterface || abstracts == null || unrelatedMethodContainingClass.isInterface()) {
@@ -623,7 +623,7 @@ public static HighlightInfo checkUnrelatedDefaultMethods(@Nonnull PsiClass aClas
623623
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
624624
.range(classIdentifier)
625625
.descriptionAndTooltip(description)
626-
.registerFix(QuickFixFactory.getInstance().createImplementMethodsFix(aClass), null, null, null, null)
626+
.registerFix(QuickFixFactory.getInstance().createImplementMethodsFix(aClass))
627627
.create();
628628
}
629629
}
@@ -992,7 +992,7 @@ public static HighlightInfo checkForeachExpressionTypeIsIterable(PsiExpression e
992992
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
993993
.range(expression)
994994
.descriptionAndTooltip(JavaErrorLocalize.foreachNotApplicable(JavaHighlightUtil.formatType(expression.getType())))
995-
.registerFix(QuickFixFactory.getInstance().createNotIterableForEachLoopFix(expression), null, null, null, null)
995+
.registerFix(QuickFixFactory.getInstance().createNotIterableForEachLoopFix(expression))
996996
.create();
997997
}
998998
return null;
@@ -1293,13 +1293,7 @@ public static HighlightInfo checkOverrideAnnotation(
12931293
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
12941294
.range(overrideAnnotation)
12951295
.descriptionAndTooltip(JavaErrorBundle.message("override.not.allowed.in.interfaces"))
1296-
.registerFix(
1297-
QuickFixFactory.getInstance().createIncreaseLanguageLevelFix(LanguageLevel.JDK_1_6),
1298-
null,
1299-
null,
1300-
null,
1301-
null
1302-
)
1296+
.registerFix(QuickFixFactory.getInstance().createIncreaseLanguageLevelFix(LanguageLevel.JDK_1_6))
13031297
.create();
13041298
}
13051299
return null;
@@ -1424,7 +1418,7 @@ public static HighlightInfo checkVarArgParameterIsLast(@Nonnull PsiParameter par
14241418
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
14251419
.range(parameter)
14261420
.descriptionAndTooltip(JavaErrorLocalize.varargNotLastParameter())
1427-
.registerFix(QuickFixFactory.getInstance().createMakeVarargParameterLastFix(parameter), null, null, null, null)
1421+
.registerFix(QuickFixFactory.getInstance().createMakeVarargParameterLastFix(parameter))
14281422
.create();
14291423
}
14301424
}
@@ -1581,7 +1575,7 @@ public static HighlightInfo checkGenericCannotExtendException(PsiReferenceList l
15811575
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
15821576
.range(referenceElement)
15831577
.descriptionAndTooltip(JavaErrorLocalize.genericExtendException())
1584-
.registerFix(QuickFixFactory.getInstance().createExtendsListFix(aClass, classType, false), null, null, null, null)
1578+
.registerFix(QuickFixFactory.getInstance().createExtendsListFix(aClass, classType, false))
15851579
.create();
15861580
}
15871581
}

0 commit comments

Comments
 (0)