From 7ebc4ff2eb9aa7c2fa133df0a81acfb0d80ab516 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Sun, 15 Apr 2018 13:59:51 +0300 Subject: [PATCH] notnull --- .../src/com/intellij/psi/PsiClassType.java | 3 ++- .../src/com/intellij/psi/impl/TypeCorrector.java | 2 +- .../intellij/util/containers/ComparatorUtil.java | 13 ++++++++----- .../groovy/lang/psi/impl/GrClassReferenceType.java | 2 +- .../plugins/groovy/lang/psi/impl/GrClosureType.java | 6 +++--- .../groovy/lang/psi/impl/GrLiteralClassType.java | 2 +- .../plugins/groovy/lang/psi/impl/GrMapType.java | 2 +- .../plugins/groovy/lang/psi/impl/GrMapTypeImpl.java | 2 +- .../plugins/groovy/lang/psi/impl/GrRangeType.java | 2 +- .../groovy/lang/psi/impl/LazyFqnClassType.java | 2 +- 10 files changed, 20 insertions(+), 16 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java index dafc4f1103f3..a03c59cae22c 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java @@ -42,7 +42,7 @@ public abstract class PsiClassType extends PsiType implements JvmReferenceType { protected final LanguageLevel myLanguageLevel; - protected PsiClassType(LanguageLevel languageLevel) { + protected PsiClassType(@NotNull LanguageLevel languageLevel) { this(languageLevel, PsiAnnotation.EMPTY_ARRAY); } @@ -67,6 +67,7 @@ public abstract class PsiClassType extends PsiType implements JvmReferenceType { * * @return the class instance, or null if the reference resolve failed. */ + @Override @Nullable public abstract PsiClass resolve(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java b/java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java index e65cde7b71db..b470a8354ac0 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/TypeCorrector.java @@ -129,7 +129,7 @@ class TypeCorrector extends PsiTypeMapper { private final PsiClassType myDelegate; private final CorrectedResolveResult myResolveResult; - private PsiCorrectedClassType(LanguageLevel languageLevel, + private PsiCorrectedClassType(@NotNull LanguageLevel languageLevel, PsiClassType delegate, CorrectedResolveResult resolveResult) { super(languageLevel, delegate.getAnnotationProvider()); diff --git a/platform/util/src/com/intellij/util/containers/ComparatorUtil.java b/platform/util/src/com/intellij/util/containers/ComparatorUtil.java index 41b1233e8cf0..beaf36e41ac1 100644 --- a/platform/util/src/com/intellij/util/containers/ComparatorUtil.java +++ b/platform/util/src/com/intellij/util/containers/ComparatorUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.util.containers; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Comparator; @@ -23,7 +24,8 @@ public class ComparatorUtil { private ComparatorUtil() { } - public static Comparator compareBy(final Convertor aspect, final Comparator comparator) { + @NotNull + public static Comparator compareBy(@NotNull final Convertor aspect, @NotNull final Comparator comparator) { return new Comparator() { @Override public int compare(Type element1, Type element2) { @@ -32,19 +34,20 @@ public class ComparatorUtil { }; } - public static > T max(T o1, T o2) { + @NotNull + public static > T max(@NotNull T o1, @NotNull T o2) { return o1.compareTo(o2) >= 0 ? o1 : o2; } - public static > T min(T o1, T o2) { + @NotNull + public static > T min(@NotNull T o1, @NotNull T o2) { return o1.compareTo(o2) >= 0 ? o2 : o1; } public static boolean equalsNullable(@Nullable T a, @Nullable T b) { if (a == null) { return b == null; - } else { - return b != null && a.equals(b); } + return a.equals(b); } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java index 9c3dfb3887c7..7c4ee2334f01 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClassReferenceType.java @@ -33,7 +33,7 @@ public class GrClassReferenceType extends PsiClassType { super(LanguageLevel.JDK_1_5); myReferenceElement = referenceElement; } - public GrClassReferenceType(GrReferenceElement referenceElement, LanguageLevel languageLevel) { + public GrClassReferenceType(GrReferenceElement referenceElement, @NotNull LanguageLevel languageLevel) { super(languageLevel); myReferenceElement = referenceElement; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java index 68cc9715262a..8cd2b1d8888d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrClosureType.java @@ -27,7 +27,7 @@ public class GrClosureType extends GrLiteralClassType { private volatile PsiType[] myTypeArgs; private GrClosableBlock myClosure; - private GrClosureType(LanguageLevel languageLevel, + private GrClosureType(@NotNull LanguageLevel languageLevel, @NotNull GlobalSearchScope scope, @NotNull JavaPsiFacade facade, @NotNull GrSignature closureSignature, @@ -37,7 +37,7 @@ public class GrClosureType extends GrLiteralClassType { if (!shouldInferTypeParameters) myTypeArgs = PsiType.EMPTY_ARRAY; } - private GrClosureType(LanguageLevel level, + private GrClosureType(@NotNull LanguageLevel level, @NotNull GlobalSearchScope scope, @NotNull JavaPsiFacade facade, @NotNull GrSignature signature, @@ -161,7 +161,7 @@ public class GrClosureType extends GrLiteralClassType { public static GrClosureType create(@NotNull GrSignature signature, GlobalSearchScope scope, JavaPsiFacade facade, - LanguageLevel languageLevel, + @NotNull LanguageLevel languageLevel, boolean shouldInferTypeParameters) { return new GrClosureType(languageLevel, scope, facade, signature, shouldInferTypeParameters); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrLiteralClassType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrLiteralClassType.java index 79b32a8c556c..ae9b6bd1110e 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrLiteralClassType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrLiteralClassType.java @@ -34,7 +34,7 @@ public abstract class GrLiteralClassType extends PsiClassType { protected final JavaPsiFacade myFacade; private final GroovyPsiManager myGroovyPsiManager; - public GrLiteralClassType(LanguageLevel languageLevel, @NotNull GlobalSearchScope scope, @NotNull JavaPsiFacade facade) { + public GrLiteralClassType(@NotNull LanguageLevel languageLevel, @NotNull GlobalSearchScope scope, @NotNull JavaPsiFacade facade) { super(languageLevel); myScope = scope; myFacade = facade; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java index 5f87fec5caef..e76cc4f8d952 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapType.java @@ -58,7 +58,7 @@ public abstract class GrMapType extends GrLiteralClassType { protected GrMapType(JavaPsiFacade facade, GlobalSearchScope scope, - LanguageLevel languageLevel) { + @NotNull LanguageLevel languageLevel) { super(languageLevel, scope, facade); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapTypeImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapTypeImpl.java index d79a63b1d2b9..8abc8439a79c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapTypeImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrMapTypeImpl.java @@ -37,7 +37,7 @@ public class GrMapTypeImpl extends GrMapType { GlobalSearchScope scope, LinkedHashMap stringEntries, List> otherEntries, - LanguageLevel languageLevel) { + @NotNull LanguageLevel languageLevel) { super(facade, scope, languageLevel); myStringEntries = stringEntries; myOtherEntries = otherEntries; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrRangeType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrRangeType.java index 29f9603fda55..f86ea05460bf 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrRangeType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GrRangeType.java @@ -38,7 +38,7 @@ public class GrRangeType extends GrLiteralClassType { private final PsiType[] myParameters; - public GrRangeType(LanguageLevel languageLevel, + public GrRangeType(@NotNull LanguageLevel languageLevel, GlobalSearchScope scope, JavaPsiFacade facade, @Nullable PsiType left, diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/LazyFqnClassType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/LazyFqnClassType.java index 9c091dbf567e..5d6dac9217c4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/LazyFqnClassType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/LazyFqnClassType.java @@ -29,7 +29,7 @@ public class LazyFqnClassType extends GrLiteralClassType { private final String myFqn; private LazyFqnClassType(@NotNull String fqn, - LanguageLevel languageLevel, + @NotNull LanguageLevel languageLevel, @NotNull GlobalSearchScope scope, @NotNull JavaPsiFacade facade) { super(languageLevel, scope, facade);