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] Remove no longer needed code from MethodChecker.checkDuplicateMethod()

Browse Source 
Checking for synthetic enum methods explicitly is no longer necessary as PsiClass.getMethods() returns also synthetic methods.


Merge-request: IJ-MR-169893
Merged-by: Marcin Mikosik <marcin.mikosik@jetbrains.com>

GitOrigin-RevId: 42111bdb35fe4180dff4bf5ebdcc9194ff2d20c8
This commit is contained in:
Marcin Mikosik
2025-07-22 10:33:05 +00:00
committed by intellij-monorepo-bot
parent 3534a3d6bc
commit ba7ed54563
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/codeserver/highlighting/src/com/intellij/java/codeserver/highlighting/MethodChecker.java
-23
View File
@@ -7,7 +7,6 @@ import com.intellij.codeInsight.daemon.impl.analysis.JavaGenericsUtil;
import com.intellij.java.codeserver.core.JavaPsiMethodUtil;
import com.intellij.java.codeserver.highlighting.errors.JavaCompilationError;
import com.intellij.java.codeserver.highlighting.errors.JavaErrorKinds;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.TextRange;
@@ -16,7 +15,6 @@ import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.psi.impl.IncompleteModelUtil;
import com.intellij.psi.impl.PsiSuperMethodImplUtil;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.*;
import com.intellij.util.containers.MostlySingularMultiMap;
@@ -29,11 +27,6 @@ final class MethodChecker {
private final @NotNull JavaErrorVisitor myVisitor;
private final @NotNull Map<PsiClass, MostlySingularMultiMap<MethodSignature, PsiMethod>> myDuplicateMethods = new HashMap<>();
private static final TokenSet BRACKET_TOKENS = TokenSet.create(JavaTokenType.LBRACKET, JavaTokenType.RBRACKET);
private static final MethodSignature ourValuesEnumSyntheticMethod =
MethodSignatureUtil.createMethodSignature("values",
PsiType.EMPTY_ARRAY,
PsiTypeParameter.EMPTY_ARRAY,
PsiSubstitutor.EMPTY);
MethodChecker(@NotNull JavaErrorVisitor visitor) { myVisitor = visitor; }
@@ -526,28 +519,12 @@ final class MethodChecker {
return false;
}
private static boolean isEnumSyntheticMethod(@NotNull MethodSignature methodSignature, @NotNull Project project) {
if (methodSignature.equals(ourValuesEnumSyntheticMethod)) return true;
PsiType javaLangString = PsiType.getJavaLangString(PsiManager.getInstance(project), GlobalSearchScope.allScope(project));
MethodSignature valueOfMethod = MethodSignatureUtil.createMethodSignature("valueOf", new PsiType[]{javaLangString},
PsiTypeParameter.EMPTY_ARRAY, PsiSubstitutor.EMPTY);
return MethodSignatureUtil.areSignaturesErasureEqual(valueOfMethod, methodSignature);
}
void checkDuplicateMethod(@NotNull PsiClass aClass, @NotNull PsiMethod method) {
if (method instanceof ExternallyDefinedPsiElement) return;
MostlySingularMultiMap<MethodSignature, PsiMethod> duplicateMethods = getDuplicateMethods(aClass);
MethodSignature methodSignature = method.getSignature(PsiSubstitutor.EMPTY);
int methodCount = 1;
List<PsiMethod> methods = (List<PsiMethod>)duplicateMethods.get(methodSignature);
if (methods.size() > 1) {
methodCount++;
}
if (methodCount == 1 && aClass.isEnum() && isEnumSyntheticMethod(methodSignature, myVisitor.project())) {
methodCount++;
}
if (methodCount > 1) {
myVisitor.report(JavaErrorKinds.METHOD_DUPLICATE.create(method));
}
}