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

[java-highlighting] Remove duplicated code; cosmetic

Browse Source 
GitOrigin-RevId: 6614eab7ab8e4535ebff45f43a0b40b0951c34ac
This commit is contained in:
Tagir Valeev
2025-03-21 14:59:41 +00:00
committed by intellij-monorepo-bot
parent 4c4b536e70
commit c05cf16cf5
3 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/ExpressionChecker.java
+7 -8
View File
@@ -400,7 +400,7 @@ final class ExpressionChecker {
}
PsiJavaCodeReferenceElement classReference = expression.getClassOrAnonymousClassReference();
checkConstructorCall(typeResult, expression, classType, classReference);
checkConstructorCall(typeResult, expression, classReference);
}
void checkAmbiguousConstructorCall(@NotNull PsiJavaCodeReferenceElement ref, PsiElement resolved) {
@@ -410,7 +410,7 @@ final class ExpressionChecker {
if (newExpression.resolveMethod() == null && !PsiTreeUtil.findChildrenOfType(argumentList, PsiFunctionalExpression.class).isEmpty()) {
PsiType type = newExpression.getType();
if (type instanceof PsiClassType classType) {
checkConstructorCall(classType.resolveGenerics(), newExpression, type, newExpression.getClassReference());
checkConstructorCall(classType.resolveGenerics(), newExpression, newExpression.getClassReference());
}
}
}
@@ -940,7 +940,7 @@ final class ExpressionChecker {
return;
}
//do not highlight module keyword if the statement is not complete
//do not highlight the 'module' keyword if the statement is not complete
//see com.intellij.lang.java.parser.BasicFileParser.parseImportStatement
if (PsiKeyword.MODULE.equals(ref.getText()) && ref.getParent() instanceof PsiImportStatement &&
PsiUtil.isAvailable(JavaFeature.MODULE_IMPORT_DECLARATIONS, ref)) {
@@ -986,7 +986,7 @@ final class ExpressionChecker {
}
}
private static boolean favorParentReport(@NotNull PsiCall methodCall, @NotNull String errorMessage) {
static boolean favorParentReport(@NotNull PsiCall methodCall, @NotNull String errorMessage) {
// Parent resolve failed as well, and it's likely more informative.
// Suppress this error to allow reporting from parent
return (errorMessage.equals(JavaPsiBundle.message("error.incompatible.type.failed.to.resolve.argument")) ||
@@ -1010,9 +1010,9 @@ final class ExpressionChecker {
return false;
}
private void checkIncompatibleType(@NotNull PsiCall methodCall,
@NotNull MethodCandidateInfo resolveResult,
@NotNull PsiElement elementToHighlight) {
void checkIncompatibleType(@NotNull PsiCall methodCall,
@NotNull MethodCandidateInfo resolveResult,
@NotNull PsiElement elementToHighlight) {
String errorMessage = resolveResult.getInferenceErrorMessage();
if (errorMessage == null) return;
if (favorParentReport(methodCall, errorMessage)) return;
@@ -1119,7 +1119,6 @@ final class ExpressionChecker {
void checkConstructorCall(@NotNull PsiClassType.ClassResolveResult typeResolveResult,
@NotNull PsiConstructorCall constructorCall,
@NotNull PsiType type,
@Nullable PsiJavaCodeReferenceElement classReference) {
PsiExpressionList list = constructorCall.getArgumentList();
if (list == null) return;
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/FunctionChecker.java
+5 -30
View File
@@ -1,7 +1,6 @@
// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.java.codeserver.highlighting;
import com.intellij.core.JavaPsiBundle;
import com.intellij.java.codeserver.highlighting.errors.JavaCompilationError;
import com.intellij.java.codeserver.highlighting.errors.JavaErrorKinds;
import com.intellij.java.codeserver.highlighting.errors.JavaIncompatibleTypeErrorContext;
@@ -115,8 +114,8 @@ final class FunctionChecker {
}
if (!receiverReferenced && isStaticSelector && !isMethodStatic && !isConstructor) {
if (functionalInterfaceType instanceof PsiClassType classType && classType.hasParameters()) {
// Prefer surrounding error, as it could be more descriptive
if (hasSurroundingInferenceError(methodRef)) return;
// Prefer the surrounding error, as it could be more descriptive
if (ExpressionChecker.hasSurroundingInferenceError(methodRef)) return;
}
myVisitor.report(JavaErrorKinds.METHOD_REFERENCE_NON_STATIC_METHOD_IN_STATIC_CONTEXT.create(methodRef, method));
return;
@@ -261,30 +260,6 @@ final class FunctionChecker {
}
}
private static boolean favorParentReport(@NotNull PsiCall methodCall, @NotNull String errorMessage) {
// Parent resolve failed as well, and it's likely more informative.
// Suppress this error to allow reporting from parent
return (errorMessage.equals(JavaPsiBundle.message("error.incompatible.type.failed.to.resolve.argument")) ||
errorMessage.equals(JavaPsiBundle.message("error.incompatible.type.declaration.for.the.method.reference.not.found"))) &&
hasSurroundingInferenceError(methodCall);
}
static boolean hasSurroundingInferenceError(@NotNull PsiElement context) {
PsiCall topCall = LambdaUtil.treeWalkUp(context);
if (topCall == null) return false;
while (context != topCall) {
context = context.getParent();
if (context instanceof PsiMethodCallExpression call &&
call.resolveMethodGenerics() instanceof MethodCandidateInfo info &&
info.getInferenceErrorMessage() != null) {
// Possibly inapplicable method reference due to the surrounding call inference failure:
// suppress method reference error in order to display more relevant inference error.
return true;
}
}
return false;
}
void checkLambdaTypeApplicability(@NotNull PsiLambdaExpression expression,
PsiElement parent,
@NotNull PsiType functionalInterfaceType) {
@@ -297,7 +272,7 @@ final class FunctionChecker {
Map<PsiElement, @Nls String> returnErrors = null;
Set<PsiTypeParameter> parentTypeParameters =
parentCallResolveResult == null ? Set.of() : Set.of(parentCallResolveResult.getElement().getTypeParameters());
// If return type of the lambda was not fully inferred and lambda parameters don't mention the same type,
// If the return type of the lambda was not fully inferred and lambda parameters don't mention the same type,
// it means that lambda is not responsible for inference failure and blaming it would be unreasonable.
boolean skipReturnCompatibility = parentCallResolveResult != null &&
PsiTypesUtil.mentionsTypeParameters(returnType, parentTypeParameters)
@@ -319,7 +294,7 @@ final class FunctionChecker {
@NotNull PsiLambdaExpression lambdaExpression) {
String errorMessage = resolveResult.getInferenceErrorMessage();
if (errorMessage == null) return;
if (favorParentReport(methodCall, errorMessage)) return;
if (ExpressionChecker.favorParentReport(methodCall, errorMessage)) return;
PsiMethod method = resolveResult.getElement();
PsiType expectedTypeByParent = InferenceSession.getTargetTypeByParent(methodCall);
PsiType actualType =
@@ -384,7 +359,7 @@ final class FunctionChecker {
myVisitor.report(JavaErrorKinds.REFERENCE_PENDING.create(referenceNameElement));
}
}
else if (!(resolvedButNonApplicable && hasSurroundingInferenceError(expression))) {
else if (!(resolvedButNonApplicable && ExpressionChecker.hasSurroundingInferenceError(expression))) {
myVisitor.report(JavaErrorKinds.METHOD_REFERENCE_UNRESOLVED_METHOD.create(expression));
}
}
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/JavaErrorVisitor.java
+1 -1
View File
@@ -284,7 +284,7 @@ final class JavaErrorVisitor extends JavaElementVisitor {
if (!hasErrorResults()) myExpressionChecker.checkUnhandledExceptions(enumConstant);
if (!hasErrorResults()) {
PsiClassType type = factory().createType(requireNonNull(enumConstant.getContainingClass()));
myExpressionChecker.checkConstructorCall(type.resolveGenerics(), enumConstant, type, null);
myExpressionChecker.checkConstructorCall(type.resolveGenerics(), enumConstant, null);
}
}