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

cleanup: remove hostile Nullable, add NotNull

Browse Source 
GitOrigin-RevId: 802c30ee41436359655e5018667720a7a7c6890a
This commit is contained in:
Alexey Kudravtsev
2020-02-04 17:49:51 +03:00
committed by intellij-monorepo-bot
parent d9110f31cc
commit e81af0f0cf
36 changed files with 177 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/java-psi-api/src/com/intellij/psi/GenericsUtil.java
View File

@@ -315,7 +315,7 @@ public class GenericsUtil {
}
PsiType transformed = type.accept(new PsiTypeVisitor<PsiType>() {
@Override
public PsiType visitArrayType(PsiArrayType arrayType) {
public PsiType visitArrayType(@NotNull PsiArrayType arrayType) {
PsiType componentType = arrayType.getComponentType();
PsiType type = componentType.accept(this);
if (type == componentType) return arrayType;
@@ -326,12 +326,12 @@ public class GenericsUtil {
}
@Override
public PsiType visitType(PsiType type) {
public PsiType visitType(@NotNull PsiType type) {
return type;
}
@Override
public PsiType visitWildcardType(final PsiWildcardType wildcardType) {
public PsiType visitWildcardType(@NotNull final PsiWildcardType wildcardType) {
final PsiType bound = wildcardType.getBound();
PsiManager manager = wildcardType.getManager();
if (bound != null) {
@@ -355,12 +355,12 @@ public class GenericsUtil {
}
@Override
public PsiType visitCapturedWildcardType(PsiCapturedWildcardType capturedWildcardType) {
public PsiType visitCapturedWildcardType(@NotNull PsiCapturedWildcardType capturedWildcardType) {
return openCaptured ? capturedWildcardType.getWildcard().accept(this) : capturedWildcardType;
}
@Override
public PsiType visitClassType(PsiClassType classType) {
public PsiType visitClassType(@NotNull PsiClassType classType) {
PsiClassType.ClassResolveResult resolveResult = classType.resolveGenerics();
PsiClass aClass = resolveResult.getElement();
if (aClass == null) return classType;

37
java/java-psi-api/src/com/intellij/psi/PsiTypeVisitor.java
View File

@@ -15,7 +15,7 @@
*/
package com.intellij.psi;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
/**
* Visitor which can be used to visit Java types.
@@ -23,66 +23,55 @@ import org.jetbrains.annotations.Nullable;
* @author dsl
*/
public class PsiTypeVisitor<A> {
@Nullable
public A visitType(PsiType type) {
public A visitType(@NotNull PsiType type) {
return null;
}
@Nullable
public A visitPrimitiveType(PsiPrimitiveType primitiveType) {
public A visitPrimitiveType(@NotNull PsiPrimitiveType primitiveType) {
return visitType(primitiveType);
}
@Nullable
public A visitArrayType(PsiArrayType arrayType) {
public A visitArrayType(@NotNull PsiArrayType arrayType) {
return visitType(arrayType);
}
@Nullable
public A visitClassType(PsiClassType classType) {
public A visitClassType(@NotNull PsiClassType classType) {
return visitType(classType);
}
@Nullable
public A visitCapturedWildcardType(PsiCapturedWildcardType capturedWildcardType) {
public A visitCapturedWildcardType(@NotNull PsiCapturedWildcardType capturedWildcardType) {
return visitWildcardType(capturedWildcardType.getWildcard());
}
@Nullable
public A visitWildcardType(PsiWildcardType wildcardType) {
public A visitWildcardType(@NotNull PsiWildcardType wildcardType) {
return visitType(wildcardType);
}
@Nullable
public A visitEllipsisType(PsiEllipsisType ellipsisType) {
public A visitEllipsisType(@NotNull PsiEllipsisType ellipsisType) {
return visitArrayType(ellipsisType);
}
@Nullable
public A visitDisjunctionType(PsiDisjunctionType disjunctionType) {
public A visitDisjunctionType(@NotNull PsiDisjunctionType disjunctionType) {
return visitType(disjunctionType);
}
@Nullable
public A visitIntersectionType(PsiIntersectionType intersectionType) {
public A visitIntersectionType(@NotNull PsiIntersectionType intersectionType) {
PsiType type = intersectionType.getConjuncts()[0];
return type.accept(this);
}
@Nullable
public A visitDiamondType(PsiDiamondType diamondType) {
public A visitDiamondType(@NotNull PsiDiamondType diamondType) {
return visitType(diamondType);
}
@Nullable
public A visitLambdaExpressionType(PsiLambdaExpressionType lambdaExpressionType) {
public A visitLambdaExpressionType(@NotNull PsiLambdaExpressionType lambdaExpressionType) {
final PsiLambdaExpression lambdaExpression = lambdaExpressionType.getExpression();
final PsiType interfaceType = lambdaExpression.getFunctionalInterfaceType();
if (interfaceType != null && LambdaUtil.isFunctionalType(interfaceType)) return interfaceType.accept(this);
return visitType(lambdaExpressionType);
}
public A visitMethodReferenceType(PsiMethodReferenceType methodReferenceType) {
public A visitMethodReferenceType(@NotNull PsiMethodReferenceType methodReferenceType) {
final PsiMethodReferenceExpression expression = methodReferenceType.getExpression();
final PsiType interfaceType = expression.getFunctionalInterfaceType();
if (interfaceType != null && LambdaUtil.isFunctionalType(interfaceType)) return interfaceType.accept(this);

12
java/java-psi-api/src/com/intellij/psi/util/ClassUtil.java
View File

@@ -293,12 +293,12 @@ public class ClassUtil {
private static PsiTypeVisitor<String> createSignatureVisitor() {
return new PsiTypeVisitor<String>() {
@Override
public String visitPrimitiveType(PsiPrimitiveType primitiveType) {
public String visitPrimitiveType(@NotNull PsiPrimitiveType primitiveType) {
return primitiveType.getCanonicalText();
}
@Override
public String visitClassType(PsiClassType classType) {
public String visitClassType(@NotNull PsiClassType classType) {
PsiClass aClass = classType.resolve();
if (aClass == null) {
return "";
@@ -307,7 +307,7 @@ public class ClassUtil {
}
@Override
public String visitArrayType(PsiArrayType arrayType) {
public String visitArrayType(@NotNull PsiArrayType arrayType) {
PsiType componentType = arrayType.getComponentType();
String typePresentation = componentType.accept(this);
if (arrayType.getDeepComponentType() instanceof PsiPrimitiveType) {
@@ -342,12 +342,12 @@ public class ClassUtil {
private static PsiTypeVisitor<String> createBinarySignatureVisitor(boolean slashes) {
return new PsiTypeVisitor<String>() {
@Override
public String visitPrimitiveType(PsiPrimitiveType primitiveType) {
public String visitPrimitiveType(@NotNull PsiPrimitiveType primitiveType) {
return primitiveType.getKind().getBinaryName();
}
@Override
public String visitClassType(PsiClassType classType) {
public String visitClassType(@NotNull PsiClassType classType) {
PsiClass aClass = classType.resolve();
if (aClass == null) {
return "";
@@ -360,7 +360,7 @@ public class ClassUtil {
}
@Override
public String visitArrayType(PsiArrayType arrayType) {
public String visitArrayType(@NotNull PsiArrayType arrayType) {
return "[" + arrayType.getComponentType().accept(this);
}
};

30
java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java
View File

@@ -353,7 +353,7 @@ public class PsiTypesUtil {
return type.accept(new PsiTypeVisitor<Boolean>() {
@Nullable
@Override
public Boolean visitClassType(PsiClassType classType) {
public Boolean visitClassType(@NotNull PsiClassType classType) {
PsiClassType.ClassResolveResult resolveResult = classType.resolveGenerics();
final PsiClass psiClass = resolveResult.getElement();
if (psiClass == null) {
@@ -371,19 +371,19 @@ public class PsiTypesUtil {
@Nullable
@Override
public Boolean visitArrayType(PsiArrayType arrayType) {
public Boolean visitArrayType(@NotNull PsiArrayType arrayType) {
return arrayType.getComponentType().accept(this);
}
@NotNull
@Override
public Boolean visitWildcardType(PsiWildcardType wildcardType) {
public Boolean visitWildcardType(@NotNull PsiWildcardType wildcardType) {
final PsiType bound = wildcardType.getBound();
return bound != null && bound.accept(this);
}
@Override
public Boolean visitType(PsiType type) {
public Boolean visitType(@NotNull PsiType type) {
return false;
}
});
@@ -516,12 +516,12 @@ public class PsiTypesUtil {
if (type == null) return false;
return type.accept(new PsiTypeVisitor<Boolean>() {
@Override
public Boolean visitType(PsiType type) {
public Boolean visitType(@NotNull PsiType type) {
return false;
}
@Override
public Boolean visitWildcardType(PsiWildcardType wildcardType) {
public Boolean visitWildcardType(@NotNull PsiWildcardType wildcardType) {
final PsiType bound = wildcardType.getBound();
if (bound != null) {
return bound.accept(this);
@@ -530,7 +530,7 @@ public class PsiTypesUtil {
}
@Override
public Boolean visitClassType(PsiClassType classType) {
public Boolean visitClassType(@NotNull PsiClassType classType) {
PsiClassType.ClassResolveResult result = classType.resolveGenerics();
final PsiClass psiClass = result.getElement();
if (psiClass != null) {
@@ -544,7 +544,7 @@ public class PsiTypesUtil {
}
@Override
public Boolean visitIntersectionType(PsiIntersectionType intersectionType) {
public Boolean visitIntersectionType(@NotNull PsiIntersectionType intersectionType) {
for (PsiType conjunct : intersectionType.getConjuncts()) {
if (conjunct.accept(this)) return true;
}
@@ -552,17 +552,17 @@ public class PsiTypesUtil {
}
@Override
public Boolean visitMethodReferenceType(PsiMethodReferenceType methodReferenceType) {
public Boolean visitMethodReferenceType(@NotNull PsiMethodReferenceType methodReferenceType) {
return false;
}
@Override
public Boolean visitLambdaExpressionType(PsiLambdaExpressionType lambdaExpressionType) {
public Boolean visitLambdaExpressionType(@NotNull PsiLambdaExpressionType lambdaExpressionType) {
return false;
}
@Override
public Boolean visitArrayType(PsiArrayType arrayType) {
public Boolean visitArrayType(@NotNull PsiArrayType arrayType) {
return arrayType.getComponentType().accept(this);
}
});
@@ -577,17 +577,17 @@ public class PsiTypesUtil {
}
@Override
public Boolean visitType(final PsiType type) {
public Boolean visitType(@NotNull final PsiType type) {
return false;
}
@Override
public Boolean visitArrayType(final PsiArrayType arrayType) {
public Boolean visitArrayType(@NotNull final PsiArrayType arrayType) {
return arrayType.getComponentType().accept(this);
}
@Override
public Boolean visitClassType(final PsiClassType classType) {
public Boolean visitClassType(@NotNull final PsiClassType classType) {
PsiClassType.ClassResolveResult resolveResult = classType.resolveGenerics();
final PsiClass aClass = resolveResult.getElement();
if (aClass instanceof PsiTypeParameter) {
@@ -607,7 +607,7 @@ public class PsiTypesUtil {
}
@Override
public Boolean visitWildcardType(final PsiWildcardType wildcardType) {
public Boolean visitWildcardType(@NotNull final PsiWildcardType wildcardType) {
final PsiType bound = wildcardType.getBound();
if (bound != null) {
bound.accept(this);

16
java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java
View File

@@ -1261,12 +1261,12 @@ public class TypeConversionUtil {
return type.accept(new PsiTypeVisitor<PsiType>() {
@Nullable
@Override
public PsiType visitType(PsiType type) {
public PsiType visitType(@NotNull PsiType type) {
return type;
}
@Override
public PsiType visitClassType(PsiClassType classType) {
public PsiType visitClassType(@NotNull PsiClassType classType) {
final PsiClass aClass = classType.resolve();
if (aClass instanceof PsiTypeParameter && !isFreshVariable((PsiTypeParameter)aClass)) {
return typeParameterErasure((PsiTypeParameter)aClass, beforeSubstitutor);
@@ -1275,28 +1275,28 @@ public class TypeConversionUtil {
}
@Override
public PsiType visitWildcardType(PsiWildcardType wildcardType) {
public PsiType visitWildcardType(@NotNull PsiWildcardType wildcardType) {
return wildcardType;
}
@Nullable
@Override
public PsiType visitCapturedWildcardType(PsiCapturedWildcardType capturedWildcardType) {
public PsiType visitCapturedWildcardType(@NotNull PsiCapturedWildcardType capturedWildcardType) {
return capturedWildcardType.getUpperBound().accept(this);
}
@Override
public PsiType visitPrimitiveType(PsiPrimitiveType primitiveType) {
public PsiType visitPrimitiveType(@NotNull PsiPrimitiveType primitiveType) {
return primitiveType;
}
@Override
public PsiType visitEllipsisType(PsiEllipsisType ellipsisType) {
public PsiType visitEllipsisType(@NotNull PsiEllipsisType ellipsisType) {
return visitArrayType(ellipsisType);
}
@Override
public PsiType visitArrayType(PsiArrayType arrayType) {
public PsiType visitArrayType(@NotNull PsiArrayType arrayType) {
final PsiType componentType = arrayType.getComponentType();
final PsiType newComponentType = componentType.accept(this);
if (newComponentType == componentType) return arrayType;
@@ -1304,7 +1304,7 @@ public class TypeConversionUtil {
}
@Override
public PsiType visitDisjunctionType(PsiDisjunctionType disjunctionType) {
public PsiType visitDisjunctionType(@NotNull PsiDisjunctionType disjunctionType) {
final PsiClassType lub = PsiTypesUtil.getLowestUpperBoundClassType(disjunctionType);
return lub != null ? erasure(lub, beforeSubstitutor) : disjunctionType;
}