Skip to content

Fixing bug in GenericsHighlightUtil which caused error while parsing code like "Map<String, String> map = new LinkedHashMap<>();" due to incorrect refactoring of GenericsHighlightUtil.checkReferenceTypeArgumentList() #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
May 30, 2025
Merged

Fixing bug in GenericsHighlightUtil which caused error while parsing code like "Map<String, String> map = new LinkedHashMap<>();" due to incorrect refactoring of GenericsHighlightUtil.checkReferenceTypeArgumentList() #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 46 additions & 57 deletions ...m/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,18 +155,56 @@ && detectExpectedType(referenceParameterList) instanceof PsiClassType expectedCl
}
}

if (registerIntentions) {
HighlightInfo.Builder wrongParamNumberHighlightInfo =
checkForWrongNumberOfTypeParameters(typeParameterListOwner, referenceParameterList, javaSdkVersion);
if (wrongParamNumberHighlightInfo != null) {
return wrongParamNumberHighlightInfo;
PsiTypeParameter[] typeParameters = typeParameterListOwner.getTypeParameters();
int targetParametersNum = typeParameters.length;
int refParametersNum = referenceParameterList == null ? 0 : referenceParameterList.getTypeArguments().length;
if (targetParametersNum != refParametersNum && refParametersNum != 0) {
LocalizeValue description;
if (targetParametersNum == 0) {
if (PsiTreeUtil.getParentOfType(referenceParameterList, PsiCall.class) != null
&& typeParameterListOwner instanceof PsiMethod method
&& (javaSdkVersion.isAtLeast(JavaSdkVersion.JDK_1_7) || hasSuperMethodsWithTypeParams(method))) {
description = LocalizeValue.empty();
}
else {
description = JavaErrorLocalize.genericsTypeOrMethodDoesNotHaveTypeParameters(
typeParameterListOwnerCategoryDescription(typeParameterListOwner),
typeParameterListOwnerDescription(typeParameterListOwner)
);
}
}
else {
description = JavaErrorLocalize.genericsWrongNumberOfTypeArguments(refParametersNum, targetParametersNum);
}

if (description != LocalizeValue.empty()) {
HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
.range(referenceParameterList)
.descriptionAndTooltip(description);
if (registerIntentions) {
QuickFixFactory factory = QuickFixFactory.getInstance();
if (typeParameterListOwner instanceof PsiClass psiClass) {
hlBuilder.registerFix(factory.createChangeClassSignatureFromUsageFix(psiClass, referenceParameterList));
}

if (referenceParameterList.getParent().getParent() instanceof PsiTypeElement typeElement
&& typeElement.getParent() instanceof PsiVariable variable) {
if (targetParametersNum == 0) {
hlBuilder.registerFix(factory.createRemoveTypeArgumentsFix(variable));
}
registerVariableParameterizedTypeFixes(
hlBuilder,
variable,
referenceParameterList,
javaSdkVersion
);
}
}
return hlBuilder;
}
}

// bounds check
PsiTypeParameter[] typeParameters = typeParameterListOwner.getTypeParameters();
int targetParametersNum = typeParameters.length;
int refParametersNum = referenceParameterList == null ? 0 : referenceParameterList.getTypeArguments().length;
if (targetParametersNum > 0 && refParametersNum != 0) {
if (inferenceResult != null) {
PsiType[] types = inferenceResult.getTypes();
Expand Down Expand Up @@ -204,55 +242,6 @@ && detectExpectedType(referenceParameterList) instanceof PsiClassType expectedCl
return null;
}

@Nullable
@RequiredReadAction
private static HighlightInfo.Builder checkForWrongNumberOfTypeParameters(
PsiTypeParameterListOwner typeParameterListOwner,
PsiReferenceParameterList referenceParameterList,
@Nonnull JavaSdkVersion javaSdkVersion
) {
PsiTypeParameter[] typeParameters = typeParameterListOwner.getTypeParameters();
int targetParametersNum = typeParameters.length;
int refParametersNum = referenceParameterList == null ? 0 : referenceParameterList.getTypeArguments().length;
if (targetParametersNum == refParametersNum || refParametersNum == 0) {
return null;
}

LocalizeValue description;
if (targetParametersNum == 0) {
if (PsiTreeUtil.getParentOfType(referenceParameterList, PsiCall.class) != null
&& typeParameterListOwner instanceof PsiMethod method
&& (javaSdkVersion.isAtLeast(JavaSdkVersion.JDK_1_7) || hasSuperMethodsWithTypeParams(method))) {
return null;
}
else {
description = JavaErrorLocalize.genericsTypeOrMethodDoesNotHaveTypeParameters(
typeParameterListOwnerCategoryDescription(typeParameterListOwner),
typeParameterListOwnerDescription(typeParameterListOwner)
);
}
}
else {
description = JavaErrorLocalize.genericsWrongNumberOfTypeArguments(refParametersNum, targetParametersNum);
}

HighlightInfo.Builder hlBuilder = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
.range(referenceParameterList)
.descriptionAndTooltip(description);
if (typeParameterListOwner instanceof PsiClass psiClass) {
hlBuilder.registerFix(QuickFixFactory.getInstance().createChangeClassSignatureFromUsageFix(psiClass, referenceParameterList));
}

if (referenceParameterList.getParent().getParent() instanceof PsiTypeElement typeElem
&& typeElem.getParent() instanceof PsiVariable variable) {
if (targetParametersNum == 0) {
hlBuilder.registerFix(QuickFixFactory.getInstance().createRemoveTypeArgumentsFix(variable));
}
registerVariableParameterizedTypeFixes(hlBuilder, variable, referenceParameterList, javaSdkVersion);
}
return hlBuilder;
}

private static boolean hasSuperMethodsWithTypeParams(PsiMethod method) {
for (PsiMethod superMethod : method.findDeepestSuperMethods()) {
if (superMethod.hasTypeParameters()) {
Expand Down
Loading