Skip to content

Replacing CommonClassNames with JavaClassNames (part 2). Refactoring. #170

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 2 commits into from
May 9, 2025
Merged

Replacing CommonClassNames with JavaClassNames (part 2). Refactoring. #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d8ba8
Replacing CommonClassNames with JavaClassNames (part 2). Refactoring.
unv-unv May 8, 2025
8ca9f58
DataFlowInstructionVisitor: fixes.
unv-unv May 9, 2025
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
69 changes: 33 additions & 36 deletions ...n/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.intellij.java.language.psi.util.PsiUtil;
import com.siyeh.ig.callMatcher.CallMatcher;
import consulo.annotation.component.ExtensionImpl;
import consulo.java.language.module.util.JavaClassNames;
import consulo.language.psi.PsiElement;
import consulo.project.Project;
import consulo.util.collection.ContainerUtil;
Expand Down Expand Up @@ -43,9 +44,9 @@ public class DefaultInferredAnnotationProvider implements InferredAnnotationProv
// Could be added via external annotations, but there are many signatures to handle
// and we have troubles supporting external annotations for JDK 9+
private static final CallMatcher IMMUTABLE_FACTORY = CallMatcher.anyOf(
CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_LIST, "of", "copyOf"),
CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_SET, "of", "copyOf"),
CallMatcher.staticCall(CommonClassNames.JAVA_UTIL_MAP, "of", "ofEntries", "copyOf", "entry")
CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_LIST, "of", "copyOf"),
CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_SET, "of", "copyOf"),
CallMatcher.staticCall(JavaClassNames.JAVA_UTIL_MAP, "of", "ofEntries", "copyOf", "entry")
);
private final NullableNotNullManager myNullabilityManager;

Expand All @@ -64,8 +65,8 @@ public PsiAnnotation findInferredAnnotation(@Nonnull PsiModifierListOwner listOw

listOwner = PsiUtil.preferCompiledElement(listOwner);

if (ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotationFQN) && listOwner instanceof PsiMethod) {
PsiAnnotation anno = getHardcodedContractAnnotation((PsiMethod)listOwner);
if (ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotationFQN) && listOwner instanceof PsiMethod method) {
PsiAnnotation anno = getHardcodedContractAnnotation(method);
if (anno != null) {
return anno;
}
Expand All @@ -82,11 +83,11 @@ public PsiAnnotation findInferredAnnotation(@Nonnull PsiModifierListOwner listOw

if (isDefaultNullabilityAnnotation(annotationFQN)) {
PsiAnnotation anno = null;
if (listOwner instanceof PsiMethodImpl) {
anno = getInferredNullabilityAnnotation((PsiMethodImpl)listOwner);
if (listOwner instanceof PsiMethodImpl method) {
anno = getInferredNullabilityAnnotation(method);
}
if (listOwner instanceof PsiParameter) {
anno = getInferredNullabilityAnnotation((PsiParameter)listOwner);
if (listOwner instanceof PsiParameter parameter) {
anno = getInferredNullabilityAnnotation(parameter);
}
return anno == null ? null : annotationFQN.equals(anno.getQualifiedName()) ? anno : null;
}
Expand All @@ -95,8 +96,8 @@ public PsiAnnotation findInferredAnnotation(@Nonnull PsiModifierListOwner listOw
return getInferredMutabilityAnnotation(listOwner);
}

if (listOwner instanceof PsiMethodImpl && ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotationFQN)) {
return getInferredContractAnnotation((PsiMethodImpl)listOwner);
if (listOwner instanceof PsiMethodImpl method && ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotationFQN)) {
return getInferredContractAnnotation(method);
}

return null;
Expand Down Expand Up @@ -136,7 +137,7 @@ private boolean ignoreInference(@Nonnull PsiModifierListOwner owner, @Nullable S
if (annotationFQN == null) {
return true;
}
if (owner instanceof PsiMethod && PsiUtil.canBeOverridden((PsiMethod)owner)) {
if (owner instanceof PsiMethod method && PsiUtil.canBeOverridden(method)) {
return true;
}
if (ORG_JETBRAINS_ANNOTATIONS_CONTRACT.equals(annotationFQN) && HardcodedContracts.hasHardcodedContracts(owner)) {
Expand All @@ -156,16 +157,15 @@ private boolean ignoreInference(@Nonnull PsiModifierListOwner owner, @Nullable S

@Nullable
private PsiAnnotation getInferredMutabilityAnnotation(@Nonnull PsiModifierListOwner owner) {
if (owner instanceof PsiMethod && IMMUTABLE_FACTORY.methodMatches((PsiMethod)owner)) {
if (owner instanceof PsiMethod method && IMMUTABLE_FACTORY.methodMatches(method)) {
return Mutability.UNMODIFIABLE.asAnnotation(myProject);
}
if (!(owner instanceof PsiMethodImpl)) {
if (!(owner instanceof PsiMethodImpl method)) {
return null;
}
PsiMethodImpl method = (PsiMethodImpl)owner;
PsiModifierList modifiers = method.getModifierList();
if (modifiers.hasAnnotation(Mutability.UNMODIFIABLE_ANNOTATION) ||
modifiers.hasAnnotation(Mutability.UNMODIFIABLE_VIEW_ANNOTATION)) {
if (modifiers.hasAnnotation(Mutability.UNMODIFIABLE_ANNOTATION)
|| modifiers.hasAnnotation(Mutability.UNMODIFIABLE_VIEW_ANNOTATION)) {
return null;
}
return JavaSourceInference.inferMutability(method).asAnnotation(myProject);
Expand Down Expand Up @@ -209,18 +209,15 @@ private PsiAnnotation getInferredNullabilityAnnotation(PsiParameter parameter) {
return null;
}
PsiElement scope = parent.getParent();
if (scope instanceof PsiMethod) {
PsiMethod method = (PsiMethod)scope;
if (method.getName().equals("of")) {
PsiClass containingClass = method.getContainingClass();
if (containingClass != null) {
String className = containingClass.getQualifiedName();
if (CommonClassNames.JAVA_UTIL_LIST.equals(className) ||
CommonClassNames.JAVA_UTIL_SET.equals(className) ||
CommonClassNames.JAVA_UTIL_MAP.equals(className) ||
"java.util.EnumSet".equals(className)) {
return ProjectBytecodeAnalysis.getInstance(myProject).getNotNullAnnotation();
}
if (scope instanceof PsiMethod method && method.getName().equals("of")) {
PsiClass containingClass = method.getContainingClass();
if (containingClass != null) {
String className = containingClass.getQualifiedName();
if (JavaClassNames.JAVA_UTIL_LIST.equals(className)
|| JavaClassNames.JAVA_UTIL_SET.equals(className)
|| JavaClassNames.JAVA_UTIL_MAP.equals(className)
|| JavaClassNames.JAVA_UTIL_ENUM_SET.equals(className)) {
return ProjectBytecodeAnalysis.getInstance(myProject).getNotNullAnnotation();
}
}
}
Expand Down Expand Up @@ -265,26 +262,26 @@ public List<PsiAnnotation> findInferredAnnotations(@Nonnull PsiModifierListOwner
}
}

if (listOwner instanceof PsiMethod) {
PsiAnnotation hardcoded = getHardcodedContractAnnotation((PsiMethod)listOwner);
if (listOwner instanceof PsiMethod method) {
PsiAnnotation hardcoded = getHardcodedContractAnnotation(method);
ContainerUtil.addIfNotNull(result, hardcoded);
if (listOwner instanceof PsiMethodImpl) {
if (listOwner instanceof PsiMethodImpl methodImpl) {
if (hardcoded == null && !ignoreInference(listOwner, ORG_JETBRAINS_ANNOTATIONS_CONTRACT)) {
ContainerUtil.addIfNotNull(result, getInferredContractAnnotation((PsiMethodImpl)listOwner));
ContainerUtil.addIfNotNull(result, getInferredContractAnnotation(methodImpl));
}

if (!ignoreInference(listOwner, myNullabilityManager.getDefaultNotNull()) ||
!ignoreInference(listOwner, myNullabilityManager.getDefaultNullable())) {
PsiAnnotation annotation = getInferredNullabilityAnnotation((PsiMethodImpl)listOwner);
PsiAnnotation annotation = getInferredNullabilityAnnotation(methodImpl);
if (annotation != null && !ignoreInference(listOwner, annotation.getQualifiedName())) {
result.add(annotation);
}
}
}
}

if (listOwner instanceof PsiParameter && !ignoreInference(listOwner, myNullabilityManager.getDefaultNotNull())) {
ContainerUtil.addIfNotNull(result, getInferredNullabilityAnnotation((PsiParameter)listOwner));
if (listOwner instanceof PsiParameter parameter && !ignoreInference(listOwner, myNullabilityManager.getDefaultNotNull())) {
ContainerUtil.addIfNotNull(result, getInferredNullabilityAnnotation(parameter));
}

ContainerUtil.addIfNotNull(result, getInferredMutabilityAnnotation(listOwner));
Expand Down
Loading
Loading