diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpBraceMatcher.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpBraceMatcher.java index 72a92d6b4994..8a773d327165 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpBraceMatcher.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpBraceMatcher.java @@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class RegExpBraceMatcher implements PairedBraceMatcher { + @NotNull @Override public BracePair[] getPairs() { return new BracePair[]{ diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/GuessManager.java b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/GuessManager.java index bda14017499e..eac4c2761fa0 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/GuessManager.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/GuessManager.java @@ -31,8 +31,10 @@ public abstract class GuessManager { return ServiceManager.getService(project, GuessManager.class); } + @NotNull public abstract PsiType[] guessContainerElementType(PsiExpression containerExpr, TextRange rangeToIgnore); + @NotNull public abstract PsiType[] guessTypeToCast(PsiExpression expr); @NotNull diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java index 008216001d0e..3bcb8f37b573 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/guess/impl/GuessManagerImpl.java @@ -79,6 +79,7 @@ public class GuessManagerImpl extends GuessManager { myProject = project; } + @NotNull @Override public PsiType[] guessContainerElementType(PsiExpression containerExpr, TextRange rangeToIgnore) { HashSet typesSet = new HashSet<>(); @@ -117,6 +118,7 @@ public class GuessManagerImpl extends GuessManager { return null; } + @NotNull @Override public PsiType[] guessTypeToCast(PsiExpression expr) { //TODO : make better guess based on control flow LinkedHashSet types = new LinkedHashSet<>(); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java index 3a28048d0777..c7c7020172f9 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java @@ -115,6 +115,7 @@ public class RedundantSuppressInspectionBase extends GlobalInspectionTool { } @NotNull + @Nullable public ProblemDescriptor[] checkElement(@NotNull final PsiElement psiElement, @NotNull final InspectionManager manager) { final Map> suppressedScopes = new THashMap<>(); psiElement.accept(new JavaRecursiveElementWalkingVisitor() { @@ -296,6 +297,7 @@ public class RedundantSuppressInspectionBase extends GlobalInspectionTool { return new GlobalInspectionContextBase(file.getProject()); } + @NotNull protected InspectionToolWrapper[] getInspectionTools(PsiElement psiElement, @NotNull InspectionManager manager) { // todo for what we create modifiable model here? return new InspectionProfileModifiableModel(InspectionProjectProfileManager.getInstance(manager.getProject()).getCurrentProfile()).getInspectionTools(psiElement); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/NullableMethodAnalysis.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/NullableMethodAnalysis.java index 5adea60e6a06..e0d4ffb10284 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/NullableMethodAnalysis.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/NullableMethodAnalysis.java @@ -18,6 +18,7 @@ package com.intellij.codeInspection.bytecodeAnalysis; import com.intellij.codeInspection.bytecodeAnalysis.asm.AnalyzerExt; import com.intellij.codeInspection.bytecodeAnalysis.asm.InterpreterExt; import com.intellij.codeInspection.bytecodeAnalysis.asm.LiteAnalyzerExt; +import org.jetbrains.annotations.NotNull; import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.tree.*; @@ -165,6 +166,7 @@ class NullableMethodAnalysis { return FinalBot; } + @NotNull private static int[] mapOrigins(boolean[] origins) { int[] originsMapping = new int[origins.length]; int mapped = 0; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java index d7353d9e2896..6116628627e6 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java @@ -151,6 +151,7 @@ public class ProjectBytecodeAnalysis { * @param methodAnnotations inferred annotations * @return Psi annotations */ + @NotNull private PsiAnnotation[] toPsi(HKey primaryKey, MethodAnnotations methodAnnotations) { boolean notNull = methodAnnotations.notNulls.contains(primaryKey); boolean nullable = methodAnnotations.nullables.contains(primaryKey); @@ -201,6 +202,7 @@ public class ProjectBytecodeAnalysis { * @param parameterAnnotations inferred parameter annotations * @return Psi annotations */ + @NotNull private PsiAnnotation[] toPsi(ParameterAnnotations parameterAnnotations) { if (parameterAnnotations.notNull) { return new PsiAnnotation[]{ diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java index 37078c49a367..5f6cee2b7d22 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java @@ -61,6 +61,7 @@ public class UncheckedWarningLocalInspectionBase extends BaseJavaBatchLocalInspe return uncheckedCb; } + @NotNull private static LocalQuickFix[] getChangeVariableTypeFixes(@NotNull PsiVariable parameter, @Nullable PsiType itemType, LocalQuickFix[] generifyFixes) { if (itemType instanceof PsiMethodReferenceType) return generifyFixes; LOG.assertTrue(parameter.isValid()); @@ -148,8 +149,9 @@ public class UncheckedWarningLocalInspectionBase extends BaseJavaBatchLocalInspe }; } + @NotNull protected LocalQuickFix[] createFixes() { - return null; + return LocalQuickFix.EMPTY_ARRAY; } private static String isMethodCalledOnRawType(PsiElement expression) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java index 9263824d1015..58ca12a62866 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java @@ -223,7 +223,8 @@ public class VisibilityInspection extends GlobalJavaBatchInspectionTool { return null; } - private static CommonProblemDescriptor[] createDescriptions(RefElement refElement, String access, + @NotNull + private static CommonProblemDescriptor[] createDescriptions(RefElement refElement, String access, @NotNull InspectionManager manager, @NotNull GlobalInspectionContext globalContext) { final PsiElement element = refElement.getElement(); @@ -250,7 +251,7 @@ public class VisibilityInspection extends GlobalJavaBatchInspectionTool { new AcceptSuggestedAccess(globalContext.getRefManager(), access, quickFixName), ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false)}; } - return null; + return CommonProblemDescriptor.EMPTY_ARRAY; } int getMinVisibilityLevel(PsiMember member) { diff --git a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java index 26b37eb61212..a9a632fedb00 100644 --- a/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java +++ b/java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java @@ -43,14 +43,14 @@ import java.util.*; public class DuplicatesFinder { private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.util.duplicates.DuplicatesFinder"); public static final Key> PARAMETER = Key.create("PARAMETER"); - private final PsiElement[] myPattern; + @NotNull private final PsiElement[] myPattern; private final InputVariables myParameters; private final List myOutputParameters; private final List myPatternAsList; private boolean myMultipleExitPoints; @Nullable private final ReturnValue myReturnValue; - public DuplicatesFinder(PsiElement[] pattern, + public DuplicatesFinder(@NotNull PsiElement[] pattern, InputVariables parameters, @Nullable ReturnValue returnValue, @NotNull List outputParameters @@ -102,6 +102,7 @@ public class DuplicatesFinder { return myParameters; } + @NotNull public PsiElement[] getPattern() { return myPattern; } @@ -674,6 +675,7 @@ public class DuplicatesFinder { return false; } + @NotNull public static PsiElement[] getFilteredChildren(PsiElement element1) { PsiElement[] children1 = element1.getChildren(); ArrayList array = new ArrayList<>(); diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java index 53381892e3cf..0dcb61bd199b 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/PolicyOptions.java @@ -15,6 +15,8 @@ */ package org.jetbrains.java.generate.config; +import org.jetbrains.annotations.NotNull; + /** * Options for the various policies. */ @@ -30,6 +32,7 @@ public class PolicyOptions { * Gets the options for the the insert new method policy. * @return the options for the the insert new method policy. */ + @NotNull public static InsertWhere[] getNewMethodOptions() { return newMethodOptions; } @@ -38,6 +41,7 @@ public class PolicyOptions { * Gets the options for the the conflict resolution policy. * @return the options for the the conflict resolution policy. */ + @NotNull public static DuplicationPolicy[] getConflictOptions() { return conflictOptions; } diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java index f4b3ddbfe205..3c923deb54f5 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java @@ -18,7 +18,6 @@ package org.jetbrains.java.generate.psi; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.JavaVersionService; -import com.intellij.openapi.projectRoots.JdkVersionUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; @@ -643,6 +642,7 @@ public class PsiAdapter { * @param clazz the class * @return the names. */ + @NotNull public static String[] getImplementsClassnames(PsiClass clazz) { PsiClass[] interfaces = clazz.getInterfaces(); diff --git a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java index d4fb28810d04..38babdfc1f53 100644 --- a/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/CodeInsightUtil.java @@ -202,6 +202,7 @@ public class CodeInsightUtil { }; } + @NotNull public static PsiExpression[] findExpressionOccurrences(PsiElement scope, PsiExpression expr) { List array = new ArrayList<>(); addExpressionOccurrences(RefactoringUtil.unparenthesizeExpression(expr), array, scope); @@ -231,6 +232,7 @@ public class CodeInsightUtil { } } + @NotNull public static PsiExpression[] findReferenceExpressions(PsiElement scope, PsiElement referee) { ArrayList array = new ArrayList<>(); if (scope != null) { diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java index f587d9597ebc..ad9d0aaa94f0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeUtil.java @@ -29,6 +29,7 @@ import java.util.*; public class ExpectedTypeUtil { private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.ExpectedTypeUtil"); + @NotNull public static ExpectedTypeInfo[] intersect(List typeInfos) { if (typeInfos.isEmpty()) return ExpectedTypeInfo.EMPTY_ARRAY; @@ -88,6 +89,7 @@ public class ExpectedTypeUtil { return myInfos.iterator(); } + @NotNull public ExpectedTypeInfo[] toArray() { return myInfos.toArray(new ExpectedTypeInfo[myInfos.size()]); } diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java index 1fea6cf90851..8f684a61093b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java @@ -155,6 +155,7 @@ public class ExpectedTypesProvider { return visitor.getResult(); } + @NotNull public static PsiType[] processExpectedTypes(@NotNull ExpectedTypeInfo[] infos, @NotNull PsiTypeVisitor visitor, @NotNull Project project) { LinkedHashSet set = new LinkedHashSet<>(); diff --git a/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java b/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java index 9dcb57ddb859..076c8b39aa6c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java +++ b/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java @@ -280,6 +280,7 @@ public class JavaTargetElementEvaluator extends TargetElementEvaluatorEx2 implem return super.acceptImplementationForReference(reference, element); } + @Nullable private static PsiClass[] getClassesWithMember(final PsiReference reference, final PsiMember member) { return ApplicationManager.getApplication().runReadAction(new Computable() { @Override diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java index 60b2bad07a46..a992b442d55b 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionSorting.java @@ -92,6 +92,7 @@ public class JavaCompletionSorting { return result.withRelevanceSorter(sorter); } + @NotNull private static ExpectedTypeInfo[] getExpectedTypesWithDfa(CompletionParameters parameters, PsiElement position) { if (psiElement().beforeLeaf(psiElement().withText(".")).accepts(position)) { return ExpectedTypeInfo.EMPTY_ARRAY; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java index dfdea4dad087..113d4b01b5bc 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java @@ -315,6 +315,7 @@ public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor { return "Java line markers"; } + @NotNull @Override public Option[] getOptions() { return new Option[] {myLambdaOption, myOverriddenOption, myImplementedOption, myOverridingOption, myImplementingOption}; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java index 36bfb93897a7..906696a91777 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddExceptionToThrowsFix.java @@ -111,6 +111,7 @@ public class AddExceptionToThrowsFix extends BaseIntentionAction { }); } + @NotNull private static PsiMethod[] getSuperMethods(@NotNull PsiMethod targetMethod) { List result = new ArrayList<>(); collectSuperMethods(targetMethod, result); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java index e145d2a3239e..c0361de76a7e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddReturnFix.java @@ -125,6 +125,7 @@ public class AddReturnFix implements IntentionAction { return null; } + @NotNull private static PsiVariable[] getDeclaredVariables(PsiMethod method) { List variables = new ArrayList<>(); PsiStatement[] statements = method.getBody().getStatements(); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java index 74fc1f365474..68f0edf88cc0 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java @@ -255,6 +255,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction/*, Hig return null; } + @Nullable protected ParameterInfoImpl[] getNewParametersInfo(PsiExpression[] expressions, PsiMethod targetMethod, PsiSubstitutor substitutor) { @@ -263,6 +264,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction/*, Hig new HashSet<>()); } + @Nullable private ParameterInfoImpl[] getNewParametersInfo(PsiExpression[] expressions, PsiMethod targetMethod, PsiSubstitutor substitutor, diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java index e43c9546ecdb..d7b299e9a0f3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateFromUsageUtils.java @@ -509,6 +509,7 @@ public class CreateFromUsageUtils { return result.toArray(new PsiReferenceExpression[result.size()]); } + @NotNull static PsiVariable[] guessMatchingVariables(final PsiExpression expression) { List typesList = new ArrayList<>(); List expectedMethodNames = new ArrayList<>(); @@ -616,6 +617,7 @@ public class CreateFromUsageUtils { return compareMembers(c1, c2, expression); } + @NotNull private static ExpectedTypeInfo[] equalsExpectedTypes(PsiMethodCallExpression methodCall) { final PsiType[] argumentTypes = methodCall.getArgumentList().getExpressionTypes(); if (argumentTypes.length != 1) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java index c91d8e8752ea..5eb9e571d980 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InitializeFinalFieldInConstructorFix.java @@ -169,6 +169,7 @@ public class InitializeFinalFieldInConstructorFix implements IntentionAction { return Collections.emptyList(); } + @NotNull private static PsiMethodMember[] toPsiMethodMemberArray(@NotNull PsiMethod[] methods) { final PsiMethodMember[] result = new PsiMethodMember[methods.length]; for (int i = 0; i < methods.length; i++) { @@ -177,6 +178,7 @@ public class InitializeFinalFieldInConstructorFix implements IntentionAction { return result; } + @NotNull private static PsiMethod[] toPsiMethodArray(@NotNull List methodMembers) { final PsiMethod[] result = new PsiMethod[methodMembers.size()]; int i = 0; @@ -191,6 +193,7 @@ public class InitializeFinalFieldInConstructorFix implements IntentionAction { ApplicationManager.getApplication().runWriteAction(() -> defaultConstructorFix.invoke(project, editor, file)); } + @NotNull private static PsiMethod[] filterIfFieldAlreadyAssigned(@NotNull PsiField field, @NotNull PsiMethod[] ctors) { final List result = new ArrayList<>(Arrays.asList(ctors)); for (PsiReference reference : ReferencesSearch.search(field, new LocalSearchScope(ctors))) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java index 88a86bc89fdb..abf0865bce82 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MethodParameterFix.java @@ -120,6 +120,7 @@ public class MethodParameterFix extends LocalQuickFixAndIntentionActionOnPsiElem return false; } + @NotNull private ParameterInfoImpl[] getNewParametersInfo(PsiMethod method) throws IncorrectOperationException { List result = new ArrayList<>(); PsiParameter[] parameters = method.getParameterList().getParameters(); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java index ae019a7f0642..4d6b9ea32532 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RemoveUnusedParameterFix.java @@ -88,6 +88,7 @@ public class RemoveUnusedParameterFix extends LocalQuickFixAndIntentionActionOnP processor.run(); } + @NotNull public static ParameterInfoImpl[] getNewParametersInfo(PsiMethod method, PsiParameter parameterToRemove) { List result = new ArrayList<>(); PsiParameter[] parameters = method.getParameterList().getParameters(); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java index b521f52d6bdf..514866b6c2f5 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java @@ -88,6 +88,7 @@ public class RenameWrongRefFix implements IntentionAction { return !CreateFromUsageUtils.isValidReference(myRefExpr, myUnresolvedOnly); } + @NotNull private LookupElement[] collectItems() { Set items = new LinkedHashSet<>(); boolean qualified = myRefExpr.getQualifierExpression() != null; diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java index a05a9999cdc1..8e7bdc6b5234 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/CopyPasteReferenceProcessor.java @@ -136,6 +136,7 @@ public abstract class CopyPasteReferenceProcessor exten qClassName, staticMemberName)); } + @NotNull protected abstract TRef[] findReferencesToRestore(PsiFile file, RangeMarker bounds, ReferenceData[] referenceData); @@ -154,7 +155,7 @@ public abstract class CopyPasteReferenceProcessor exten protected abstract void restoreReferences(ReferenceData[] referenceData, TRef[] refs); - private static void askReferencesToRestore(Project project, PsiElement[] refs, + private static void askReferencesToRestore(Project project, @NotNull PsiElement[] refs, ReferenceData[] referenceData) { PsiManager manager = PsiManager.getInstance(project); diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java index 273cbe111c69..df243d294e26 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaCopyPasteReferenceProcessor.java @@ -22,6 +22,7 @@ import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.ArrayList; @@ -59,6 +60,7 @@ public class JavaCopyPasteReferenceProcessor extends CopyPasteReferenceProcessor } + @NotNull @Override protected PsiJavaCodeReferenceElement[] findReferencesToRestore(PsiFile file, RangeMarker bounds, diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java index 76c37546888b..3ba81322d988 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/ReferenceTransferableData.java @@ -15,6 +15,8 @@ */ package com.intellij.codeInsight.editorActions; +import org.jetbrains.annotations.NotNull; + import java.awt.datatransfer.DataFlavor; import java.io.Serializable; @@ -24,7 +26,7 @@ import java.io.Serializable; public class ReferenceTransferableData implements TextBlockTransferableData, Cloneable, Serializable { private final ReferenceData[] myReferenceDatas; - public ReferenceTransferableData(final ReferenceData[] referenceDatas) { + public ReferenceTransferableData(@NotNull ReferenceData[] referenceDatas) { myReferenceDatas = referenceDatas; } @@ -65,6 +67,7 @@ public class ReferenceTransferableData implements TextBlockTransferableData, Clo return new ReferenceTransferableData(newReferenceData); } + @NotNull public ReferenceData[] getData() { return myReferenceDatas; } diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java index 51427dd93d8b..409469805cde 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/RestoreReferencesDialog.java @@ -27,6 +27,7 @@ import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBList; import com.intellij.util.ui.JBUI; import com.intellij.util.ui.UIUtil; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -97,6 +98,7 @@ class RestoreReferencesDialog extends DialogWrapper { return "#com.intellij.codeInsight.editorActions.RestoreReferencesDialog"; } + @NotNull public Object[] getSelectedElements(){ return mySelectedElements; } diff --git a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java index fbf403685224..48c329c54949 100644 --- a/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java +++ b/java/java-impl/src/com/intellij/codeInsight/highlighting/JavaBraceMatcher.java @@ -35,6 +35,7 @@ public class JavaBraceMatcher implements PairedBraceMatcher { new BracePair(JavaTokenType.LT, JavaTokenType.GT, false) }; + @NotNull @Override public BracePair[] getPairs() { return pairs; diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java index 75be9546415b..a61c2b42269e 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionMerger.java @@ -19,6 +19,7 @@ import com.intellij.codeInspection.ex.InspectionElementsMergerBase; import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import com.intellij.openapi.util.WriteExternalException; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; public class UnusedDeclarationInspectionMerger extends InspectionElementsMergerBase { private static final String UNUSED_SYMBOL = "UNUSED_SYMBOL"; @@ -29,6 +30,7 @@ public class UnusedDeclarationInspectionMerger extends InspectionElementsMergerB return UnusedDeclarationInspectionBase.SHORT_NAME; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] {UNUSED_SYMBOL, UNUSED_DECLARATION}; diff --git a/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java b/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java index 5107b6691cae..1a1222220fac 100644 --- a/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java +++ b/java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java @@ -59,6 +59,7 @@ import com.intellij.ui.TitledSeparator; import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewUtil; import com.intellij.usages.*; +import com.intellij.util.ObjectUtils; import com.intellij.util.Processor; import com.intellij.util.SequentialModalProgressTask; import com.intellij.util.containers.ContainerUtil; @@ -299,9 +300,10 @@ public class InferNullityAnnotationsAction extends BaseAnalysisAction { @NotNull private Factory rerunFactory(@NotNull final Project project, @NotNull final AnalysisScope scope) { return () -> new UsageInfoSearcherAdapter() { + @NotNull @Override protected UsageInfo[] findUsages() { - return InferNullityAnnotationsAction.this.findUsages(project, scope, scope.getFileCount()); + return ObjectUtils.notNull(InferNullityAnnotationsAction.this.findUsages(project, scope, scope.getFileCount()), UsageInfo.EMPTY_ARRAY); } @Override diff --git a/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspectionMerger.java b/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspectionMerger.java index d2631f129cb5..04c8d9f50542 100644 --- a/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspectionMerger.java +++ b/java/java-impl/src/com/intellij/codeInspection/java18api/Java8MapApiInspectionMerger.java @@ -16,6 +16,7 @@ package com.intellij.codeInspection.java18api; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; public class Java8MapApiInspectionMerger extends InspectionElementsMerger { private static final String COLLECTION_API_INSPECTION = "Java8CollectionsApi"; @@ -26,6 +27,7 @@ public class Java8MapApiInspectionMerger extends InspectionElementsMerger { return Java8MapApiInspection.SHORT_NAME; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] {COLLECTION_API_INSPECTION, REPLACE_MAP_GET_INSPECTION}; diff --git a/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java index e9b3f498c90c..48f1357b6d16 100644 --- a/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspection.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.GenerifyFileFix; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.openapi.util.Pass; import com.intellij.util.ui.JBUI; +import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; @@ -30,6 +31,7 @@ import java.awt.*; */ public class UncheckedWarningLocalInspection extends UncheckedWarningLocalInspectionBase { + @NotNull @Override protected LocalQuickFix[] createFixes() { return new LocalQuickFix[]{new GenerifyFileFix()}; diff --git a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java index e48ef65df984..4d0081fe7461 100644 --- a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java +++ b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java @@ -282,7 +282,8 @@ public class PackageUtil { return psiDirectory; } - private static PsiDirectory[] filterSourceDirectories(PsiDirectory baseDir, Project project, PsiDirectory[] moduleDirectories) { + @NotNull + private static PsiDirectory[] filterSourceDirectories(PsiDirectory baseDir, Project project, @NotNull PsiDirectory[] moduleDirectories) { final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex(); if (fileIndex.isInTestSourceContent(baseDir.getVirtualFile())) { List result = new ArrayList<>(); @@ -296,6 +297,7 @@ public class PackageUtil { return moduleDirectories; } + @NotNull private static PsiDirectory[] getPackageDirectoriesInModule(PsiPackage rootPackage, Module module) { return rootPackage.getDirectories(GlobalSearchScope.moduleScope(module)); } diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java index b83ef579c80f..1f94d45a56b9 100644 --- a/java/java-impl/src/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java +++ b/java/java-impl/src/com/intellij/openapi/roots/impl/ModulePackageIndexImpl.java @@ -40,11 +40,13 @@ public class ModulePackageIndexImpl extends ModulePackageIndex { } }; + @NotNull @Override public Query getDirsByPackageName(@NotNull String packageName, boolean includeLibrarySources) { return new FilteredQuery<>(myDirectoryIndex.getDirectoriesByPackageName(packageName, includeLibrarySources), myDirCondition); } + @NotNull @Override public VirtualFile[] getDirectoriesByPackageName(@NotNull String packageName, boolean includeLibrarySources) { return getDirsByPackageName(packageName, includeLibrarySources).toArray(VirtualFile.EMPTY_ARRAY); diff --git a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java index a113f479bc78..bbb9e5d05005 100644 --- a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java +++ b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java @@ -64,6 +64,7 @@ public abstract class AbstractQualifiedReference result = new THashSet<>(infos.length); for (ExpectedTypeInfo info : infos) { diff --git a/java/java-impl/src/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java b/java/java-impl/src/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java index a22900e78299..5a145df83274 100644 --- a/java/java-impl/src/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java +++ b/java/java-impl/src/com/intellij/psi/filters/getters/InstanceOfLeftPartTypeGetter.java @@ -18,6 +18,7 @@ package com.intellij.psi.filters.getters; import com.intellij.psi.*; import com.intellij.psi.filters.FilterUtil; import com.intellij.psi.util.PsiTreeUtil; +import org.jetbrains.annotations.NotNull; /** * Created by IntelliJ IDEA. @@ -27,6 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil; * To change this template use Options | File Templates. */ public class InstanceOfLeftPartTypeGetter { + @NotNull public static PsiType[] getLeftTypes(PsiElement context) { if((context = FilterUtil.getPreviousElement(context, true)) == null) return PsiType.EMPTY_ARRAY; if(!PsiKeyword.INSTANCEOF.equals(context.getText())) return PsiType.EMPTY_ARRAY; diff --git a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java index 00f3fa717a84..602db4863edd 100644 --- a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java @@ -89,6 +89,7 @@ public class BeanPropertyElement extends FakePsiElement implements PsiMetaOwner, } + @NotNull @Override public Object[] getDependences() { return ArrayUtil.EMPTY_OBJECT_ARRAY; diff --git a/java/java-impl/src/com/intellij/psi/impl/cache/SmartIntToIntArrayMap.java b/java/java-impl/src/com/intellij/psi/impl/cache/SmartIntToIntArrayMap.java index 704442600529..5aee5706816e 100644 --- a/java/java-impl/src/com/intellij/psi/impl/cache/SmartIntToIntArrayMap.java +++ b/java/java-impl/src/com/intellij/psi/impl/cache/SmartIntToIntArrayMap.java @@ -19,6 +19,7 @@ import com.intellij.util.ArrayUtil; import gnu.trove.TIntArrayList; import gnu.trove.TIntIntHashMap; import gnu.trove.TIntObjectHashMap; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -28,6 +29,7 @@ public class SmartIntToIntArrayMap { @Nullable TIntObjectHashMap myMultipleValuesMap; TIntIntHashMap mySingleValueMap = new TIntIntHashMap(10, 0.9f); + @NotNull public int[] keys() { int[] multiKeys = myMultipleValuesMap != null ? myMultipleValuesMap.keys() : ArrayUtil.EMPTY_INT_ARRAY; int[] singleKeys = mySingleValueMap.keys(); @@ -95,6 +97,7 @@ public class SmartIntToIntArrayMap { } } + @NotNull public int[] get(int key) { if (mySingleValueMap.containsKey(key)) { int id = mySingleValueMap.get(key); @@ -104,6 +107,7 @@ public class SmartIntToIntArrayMap { return getFromMultimap(key); } + @NotNull private int[] getFromMultimap(int key) { TIntArrayList res = myMultipleValuesMap != null ? myMultipleValuesMap.get(key) : null; if (res == null) return ArrayUtil.EMPTY_INT_ARRAY; diff --git a/java/java-impl/src/com/intellij/psi/impl/migration/MigrationClassImpl.java b/java/java-impl/src/com/intellij/psi/impl/migration/MigrationClassImpl.java index c1d0e0aea4fd..299710bd8314 100644 --- a/java/java-impl/src/com/intellij/psi/impl/migration/MigrationClassImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/migration/MigrationClassImpl.java @@ -127,6 +127,7 @@ public class MigrationClassImpl extends LightElement implements PsiClass{ .findClass(CommonClassNames.JAVA_LANG_OBJECT, GlobalSearchScope.allScope(myManager.getProject())); } + @NotNull @Override public PsiClass[] getInterfaces() { return PsiClass.EMPTY_ARRAY; diff --git a/java/java-impl/src/com/intellij/psi/impl/migration/MigrationPackageImpl.java b/java/java-impl/src/com/intellij/psi/impl/migration/MigrationPackageImpl.java index 90d5ffe20df8..3b8c2fcb8dc0 100644 --- a/java/java-impl/src/com/intellij/psi/impl/migration/MigrationPackageImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/migration/MigrationPackageImpl.java @@ -50,6 +50,7 @@ public class MigrationPackageImpl extends PsiPackageImpl implements PsiPackage { throw new UnsupportedOperationException(); } + @NotNull @Override public VirtualFile[] occursInPackagePrefixes() { return VirtualFile.EMPTY_ARRAY; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java index d6a45a6e22ea..22cbfa8574ae 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java @@ -30,7 +30,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Iconable; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.TextRange; @@ -268,6 +267,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return context == null ? JavaPsiFacade.getInstance(getElement().getProject()).findPackage("") : context; } + @Nullable public String[] getExtendClassNames() { return JavaClassReferenceProvider.EXTEND_CLASS_NAMES.getValue(getOptions()); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java index cc0267c567c4..e782f3748043 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReferenceProvider.java @@ -115,6 +115,7 @@ public class JavaClassReferenceProvider extends GenericReferenceProvider impleme return getReferencesByElement(element); } + @NotNull public PsiReference[] getReferencesByElement(@NotNull PsiElement element) { final int offsetInElement = ElementManipulators.getOffsetInElement(element); final String text = ElementManipulators.getValueText(element); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PathListReferenceProvider.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PathListReferenceProvider.java index df171339ff01..c8b409dac004 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PathListReferenceProvider.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/PathListReferenceProvider.java @@ -39,6 +39,7 @@ public class PathListReferenceProvider extends PsiReferenceProvider { return true; } + @NotNull public PsiReference[] getReferencesByElement(@NotNull PsiElement element) { PsiReference[] result = PsiReference.EMPTY_ARRAY; @@ -75,6 +76,7 @@ public class PathListReferenceProvider extends PsiReferenceProvider { return ','; } + @NotNull protected PsiReference[] createReferences(@NotNull PsiElement element, String s, int offset, final boolean soft) { int contentOffset = StringUtil.findFirst(s, CharFilter.NOT_WHITESPACE_FILTER); if (contentOffset >= 0) { diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java index 9a2d0c3b15cf..23b0349dbf42 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotatedElementsSearch.java @@ -54,6 +54,7 @@ public class AnnotatedElementsSearch extends ExtensibleQueryFactory[] getTypes() { return myTypes; } diff --git a/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java b/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java index 601ff499ae60..a42fe07b59c7 100644 --- a/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java +++ b/java/java-indexing-impl/src/com/intellij/openapi/roots/impl/ProjectPackageIndexImpl.java @@ -27,11 +27,13 @@ public class ProjectPackageIndexImpl extends PackageIndex { myDirectoryIndex = directoryIndex; } + @NotNull @Override public VirtualFile[] getDirectoriesByPackageName(@NotNull String packageName, boolean includeLibrarySources) { return getDirsByPackageName(packageName, includeLibrarySources).toArray(VirtualFile.EMPTY_ARRAY); } + @NotNull @Override public Query getDirsByPackageName(@NotNull String packageName, boolean includeLibrarySources) { return myDirectoryIndex.getDirectoriesByPackageName(packageName, includeLibrarySources); diff --git a/java/java-psi-api/src/com/intellij/openapi/roots/PackageIndex.java b/java/java-psi-api/src/com/intellij/openapi/roots/PackageIndex.java index 4fb9f9712e1f..83d166a3eab5 100644 --- a/java/java-psi-api/src/com/intellij/openapi/roots/PackageIndex.java +++ b/java/java-psi-api/src/com/intellij/openapi/roots/PackageIndex.java @@ -37,6 +37,7 @@ public abstract class PackageIndex { * @param includeLibrarySources if true, directories under library sources are included in the returned list. * @return the list of directories. */ + @NotNull public abstract VirtualFile[] getDirectoriesByPackageName(@NotNull String packageName, boolean includeLibrarySources); /** @@ -47,5 +48,6 @@ public abstract class PackageIndex { * @param includeLibrarySources if true, directories under library sources are included in the returned list. * @return the query returning the list of directories. */ + @NotNull public abstract Query getDirsByPackageName(@NotNull String packageName, boolean includeLibrarySources); } diff --git a/java/java-psi-api/src/com/intellij/psi/HierarchicalMethodSignature.java b/java/java-psi-api/src/com/intellij/psi/HierarchicalMethodSignature.java index 6430ae0dbff3..ce23392c5a7a 100644 --- a/java/java-psi-api/src/com/intellij/psi/HierarchicalMethodSignature.java +++ b/java/java-psi-api/src/com/intellij/psi/HierarchicalMethodSignature.java @@ -33,6 +33,7 @@ public abstract class HierarchicalMethodSignature extends MethodSignatureBackedB getParameterTypes(signature.getMethod()), signature.getTypeParameters()); } + @NotNull private static PsiType[] getParameterTypes(PsiMethod method) { final PsiParameter[] parameters = method.getParameterList().getParameters(); final PsiType[] paramTypes = PsiType.createArray(parameters.length); diff --git a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java index 95833732fa89..0f9eec926c9b 100644 --- a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java @@ -554,6 +554,7 @@ public class LambdaUtil { typeByExpression instanceof PsiLambdaParameterType; } + @NotNull public static PsiReturnStatement[] getReturnStatements(PsiLambdaExpression lambdaExpression) { final PsiElement body = lambdaExpression.getBody(); return body instanceof PsiCodeBlock ? PsiUtil.findReturnStatements((PsiCodeBlock)body) : PsiReturnStatement.EMPTY_ARRAY; diff --git a/java/java-psi-api/src/com/intellij/psi/PsiClass.java b/java/java-psi-api/src/com/intellij/psi/PsiClass.java index 017f69a34747..70837c84d15d 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiClass.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiClass.java @@ -116,6 +116,7 @@ public interface PsiClass * * @return the list of interfaces. */ + @NotNull PsiClass[] getInterfaces(); /** @@ -124,7 +125,8 @@ public interface PsiClass * @return the list of classes or interfaces. May return zero elements when jdk is * not configured, so no java.lang.Object is found */ - @NotNull PsiClass[] getSupers(); + @NotNull + PsiClass[] getSupers(); /** * Returns the list of class types for the classes and interfaces extended or diff --git a/java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java b/java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java index d92fba8c8b3b..e4db84f06360 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiIntersectionType.java @@ -15,12 +15,10 @@ */ package com.intellij.psi; -import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; -import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -50,7 +48,7 @@ public class PsiIntersectionType extends PsiType.Stub { } @NotNull - public static PsiType createIntersection(boolean flatten, PsiType... conjuncts) { + public static PsiType createIntersection(boolean flatten, @NotNull PsiType... conjuncts) { assert conjuncts.length > 0; if (flatten) { conjuncts = flattenAndRemoveDuplicates(conjuncts); @@ -59,7 +57,8 @@ public class PsiIntersectionType extends PsiType.Stub { return new PsiIntersectionType(conjuncts); } - private static PsiType[] flattenAndRemoveDuplicates(final PsiType[] conjuncts) { + @NotNull + private static PsiType[] flattenAndRemoveDuplicates(@NotNull PsiType[] conjuncts) { try { final Set flattenConjuncts = PsiCapturedWildcardType.guard.doPreventingRecursion(conjuncts, true, () -> flatten(conjuncts, ContainerUtil.newLinkedHashSet())); if (flattenConjuncts == null) { diff --git a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java index 22e4a9c12a90..76982b89fbe4 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiPackage.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiPackage.java @@ -90,6 +90,7 @@ public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, Psi * * @since 14.1 */ + @NotNull PsiFile[] getFiles(@NotNull GlobalSearchScope scope); /** @@ -114,6 +115,7 @@ public interface PsiPackage extends PsiCheckedRenameElement, NavigationItem, Psi * * @return the array of virtual files for the source roots. */ + @NotNull VirtualFile[] occursInPackagePrefixes(); @Override diff --git a/java/java-psi-api/src/com/intellij/psi/PsiTypeParameterList.java b/java/java-psi-api/src/com/intellij/psi/PsiTypeParameterList.java index 6a6b15219ee6..5fb0f6ad6ed2 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiTypeParameterList.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiTypeParameterList.java @@ -15,6 +15,8 @@ */ package com.intellij.psi; +import org.jetbrains.annotations.NotNull; + /** * Represents a list of generic type parameters for a class or method. * @@ -26,6 +28,7 @@ public interface PsiTypeParameterList extends PsiElement { * * @return the array of type parameters. */ + @NotNull PsiTypeParameter[] getTypeParameters(); /** diff --git a/java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java b/java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java index 6b82db34f3f4..aaec31c9d681 100644 --- a/java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java +++ b/java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java @@ -436,6 +436,7 @@ public class MethodCandidateInfo extends CandidateInfo{ } } + @Nullable public PsiType[] getArgumentTypes() { return myArgumentTypes; } diff --git a/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTag.java b/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTag.java index fc5d2f68363d..3daeb9dbed59 100644 --- a/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTag.java +++ b/java/java-psi-api/src/com/intellij/psi/javadoc/PsiDocTag.java @@ -47,6 +47,7 @@ public interface PsiDocTag extends PsiElement, PsiNamedElement { /** * Returns the list of all elements representing the contents of a tag. */ + @NotNull PsiElement[] getDataElements(); /** diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java index aff0a0ed6fbe..f69d38b442a3 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiTypesUtil.java @@ -334,8 +334,9 @@ public class PsiTypesUtil { return parameterType; } + @NotNull public static PsiTypeParameter[] filterUnusedTypeParameters(final PsiType superReturnTypeInBaseClassType, - final PsiTypeParameter[] typeParameters) { + @NotNull PsiTypeParameter[] typeParameters) { if (typeParameters.length == 0) return typeParameters; final Set usedParameters = new HashSet<>(); diff --git a/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java b/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java index ac2e7fd8daea..1215ca58fe03 100644 --- a/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java +++ b/java/java-psi-impl/src/com/intellij/core/CorePackageIndex.java @@ -49,11 +49,13 @@ public class CorePackageIndex extends PackageIndex { return result; } + @NotNull @Override public VirtualFile[] getDirectoriesByPackageName(@NotNull String packageName, boolean includeLibrarySources) { return getDirsByPackageName(packageName, includeLibrarySources).toArray(VirtualFile.EMPTY_ARRAY); } + @NotNull @Override public Query getDirsByPackageName(@NotNull String packageName, boolean includeLibrarySources) { return new CollectionQuery<>(findDirectoriesByPackageName(packageName)); diff --git a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java index 8dcc48272ea8..761d5f02fe10 100644 --- a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java @@ -409,6 +409,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType { } } + @NotNull private static PsiTypeParameter[] getAllTypeParams(PsiTypeParameterListOwner listOwner, PsiClass containingClass) { Set params = new LinkedHashSet<>(); Collections.addAll(params, containingClass.getTypeParameters()); diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java index 96d3738d5263..adaeb73a7f42 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/CompositeInstructionClientVisitor.java @@ -16,6 +16,8 @@ package com.intellij.psi.controlFlow; +import org.jetbrains.annotations.NotNull; + class CompositeInstructionClientVisitor extends InstructionClientVisitor { private final InstructionClientVisitor[] myVisitors; @@ -24,6 +26,7 @@ class CompositeInstructionClientVisitor extends InstructionClientVisitor writtenVariables = getWrittenVariables(flow, start, end, false); ArrayList array = new ArrayList<>(); @@ -1008,6 +1009,7 @@ public class ControlFlowUtil { return visitor.getResult().booleanValue(); } + @NotNull public static Object[] getAllWorldProblemsAtOnce(final ControlFlow flow) { InstructionClientVisitor[] visitors = { new ReturnPresentClientVisitor(flow), @@ -2044,6 +2046,7 @@ public class ControlFlowUtil { } } + @NotNull int[] getNextOffsets(int offset) { return nextOffsets[offset] != null ? nextOffsets[offset] : ArrayUtil.EMPTY_INT_ARRAY; } diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java index 31bd527c07e0..15ad46c1fe2f 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/DefUseUtil.java @@ -454,6 +454,7 @@ public class DefUseUtil { } + @NotNull private static IntArrayList[] getBackwardTraces(final List instructions) { final IntArrayList[] states = new IntArrayList[instructions.size()]; for (int i = 0; i < states.length; i++) { diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java index 897be1311430..9220c230bded 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ReturnInstruction.java @@ -49,6 +49,7 @@ public class ReturnInstruction extends GoToInstruction { } } + @NotNull public int[] getPossibleReturnOffsets() { return offset == 0 ? new int[]{ diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java index 3178acecb254..af8440a6c12b 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiImplUtil.java @@ -331,6 +331,7 @@ public class PsiImplUtil { } /** @deprecated use {@link AnnotationTargetUtil#getTargetsForLocation(PsiAnnotationOwner)} (to be removed ion IDEA 17) */ + @NotNull public static PsiAnnotation.TargetType[] getTargetsForLocation(@Nullable PsiAnnotationOwner owner) { return AnnotationTargetUtil.getTargetsForLocation(owner); } @@ -560,6 +561,7 @@ public class PsiImplUtil { return null; } + @NotNull public static PsiStatement[] getChildStatements(@NotNull CompositeElement psiCodeBlock) { ApplicationManager.getApplication().assertReadAccessAllowed(); // no lock is needed because all chameleons are expanded already @@ -713,6 +715,7 @@ public class PsiImplUtil { return multiResolveImpl(manager.getProject(), psiFile, element, incompleteCode, resolver); } + @NotNull public static JavaResolveResult[] multiResolveImpl(@NotNull Project project, @NotNull PsiFile psiFile, @NotNull T element, diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java index 2be3ffda22dc..6c0a217520c8 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsClassImpl.java @@ -126,6 +126,7 @@ public class ClsClassImpl extends ClsMemberImpl> implements PsiE return PsiClassImplUtil.getSuperClass(this); } + @NotNull @Override public PsiClass[] getInterfaces() { return PsiClassImplUtil.getInterfaces(this); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java index c49d281c65a4..690ebea39b5e 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsDocTagImpl.java @@ -100,6 +100,7 @@ class ClsDocTagImpl extends ClsElementImpl implements PsiDocTag { return myNameElement; } + @NotNull @Override public PsiElement[] getDataElements() { return PsiElement.EMPTY_ARRAY; diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java index 1a3779eb21ee..b982a6f37edf 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterImpl.java @@ -247,6 +247,7 @@ public class ClsTypeParameterImpl extends ClsRepositoryPsiElement> scopeMap = SoftReference.dereference(myDumbModeFullCache); if (scopeMap == null) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java index baef0daece76..43decfb9e35c 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/AbstractLightClass.java @@ -149,6 +149,7 @@ public abstract class AbstractLightClass extends LightElement implements PsiClas return getDelegate().getSuperClass(); } + @NotNull @Override public PsiClass[] getInterfaces() { return getDelegate().getInterfaces(); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java index 4988c6b530ea..b3c2ac00fc91 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightModifierList.java @@ -135,6 +135,7 @@ public class LightModifierList extends LightElement implements PsiModifierList { return buffer.toString(); } + @NotNull public String[] getModifiers() { return ArrayUtil.toStringArray(myModifiers); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightPsiClassBase.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightPsiClassBase.java index d70471865b90..6e0b5a9bad67 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightPsiClassBase.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightPsiClassBase.java @@ -106,6 +106,7 @@ public abstract class LightPsiClassBase extends LightElement implements PsiClass return PsiClassImplUtil.getSuperClass(this); } + @NotNull @Override public PsiClass[] getInterfaces() { return PsiClassImplUtil.getInterfaces(this); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameterListBuilder.java b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameterListBuilder.java index aab43cd3c848..f8137d5159cd 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameterListBuilder.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/light/LightTypeParameterListBuilder.java @@ -48,6 +48,7 @@ public class LightTypeParameterListBuilder extends LightElement implements PsiTy } } + @NotNull @Override public PsiTypeParameter[] getTypeParameters() { if (cached == null) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java index 0ae6fdb847f4..e002c39843a7 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/ClassInnerStuffCache.java @@ -44,6 +44,7 @@ public class ClassInnerStuffCache { myClass = aClass; } + @NotNull private static T[] copy(T[] value) { return value.length == 0 ? value : value.clone(); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java index 544ee49d8a0e..c631151c96e6 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java @@ -218,6 +218,7 @@ public class PsiClassImpl extends JavaStubPsiElement> implements return PsiClassImplUtil.getSuperClass(this); } + @NotNull @Override public PsiClass[] getInterfaces() { return PsiClassImplUtil.getInterfaces(this); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java index 8486761d2396..06dc0c3c6df7 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassReferenceType.java @@ -53,6 +53,7 @@ public class PsiClassReferenceType extends PsiClassType.Stub { myReference = reference; } + @NotNull private static PsiAnnotation[] collectAnnotations(PsiJavaCodeReferenceElement reference) { List result = null; for (PsiElement child = reference.getFirstChild(); child != null; child = child.getNextSibling()) { diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java index af92ae85afb9..4622a58f8eb8 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java @@ -135,12 +135,14 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo return null; } + @NotNull public static PsiVariable[] getAllVariables(PsiElement scope, PsiElement place) { final SmartList result = new SmartList<>(); scope.processDeclarations(new FilterScopeProcessor<>(ElementClassFilter.VARIABLE, result), ResolveState.initial(), null, place); return result.toArray(new PsiVariable[result.size()]); } + @NotNull public static PsiMethod[] getAllMethods(PsiElement scope, PsiElement place) { final SmartList result = new SmartList<>(); scope.processDeclarations(new FilterScopeProcessor<>(ElementClassFilter.METHOD, result), ResolveState.initial(), null, place); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java index 9f2b59ec5538..22e318e29e25 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocTagImpl.java @@ -57,6 +57,7 @@ public class PsiDocTagImpl extends CompositePsiElement implements PsiDocTag, Con return (PsiDocTagValue)findPsiChildByType(TAG_VALUE_BIT_SET); } + @NotNull @Override public PsiElement[] getDataElements() { return getChildrenAsPsiElements(VALUE_BIT_SET, PsiElement.ARRAY_FACTORY); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java index 668453c71a70..bc02ff3c5f86 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/javadoc/PsiInlineDocTagImpl.java @@ -59,11 +59,13 @@ public class PsiInlineDocTagImpl extends CompositePsiElement implements PsiInlin return findPsiChildByType(DOC_TAG_NAME); } + @NotNull @Override public PsiElement[] getDataElements() { return getChildrenAsPsiElements(VALUE_BIT_SET, PsiElement.ARRAY_FACTORY); } + @NotNull public PsiElement[] getDataElementsIgnoreWhitespaces() { return getChildrenAsPsiElements(VALUE_NO_WHITESPACE_BIT_SET, PsiElement.ARRAY_FACTORY); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java index 51eac11d42b8..381d2e2cc3b8 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/StaticImportResolveProcessor.java @@ -99,6 +99,7 @@ public class StaticImportResolveProcessor extends BaseScopeProcessor implements return super.getHint(hintKey); } + @NotNull public JavaResolveResult[] getResults() { if (myResults.size() + myFieldResults.size() + myClassResult.size() > 1) { filterInvalid(myResults); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java index ca479e39b12e..bdcae30812ba 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiTypeParameterImpl.java @@ -292,6 +292,7 @@ public class PsiTypeParameterImpl extends JavaStubPsiElement + + + diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionToolProvider.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionToolProvider.java index 628620738a7a..022e83666fed 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionToolProvider.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionToolProvider.java @@ -16,6 +16,7 @@ package com.intellij.codeInspection; import com.intellij.openapi.extensions.ExtensionPointName; +import org.jetbrains.annotations.NotNull; /** * Plugin's ApplicationComponent or extension that implements this interface will be automatically queried for inspection tool classes. @@ -27,5 +28,6 @@ public interface InspectionToolProvider { * Query method for inspection tools provided by a plugin. * @return classes that extend {@link InspectionProfileEntry} */ + @NotNull Class[] getInspectionClasses(); } diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java index 3b451a7bd7c6..42feffa8a485 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionElementsMerger.java @@ -18,6 +18,7 @@ package com.intellij.codeInspection.ex; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; import com.intellij.util.ArrayUtilRt; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.HashMap; @@ -49,6 +50,7 @@ public abstract class InspectionElementsMerger { /** * @return the shortNames of the merged inspections */ + @NotNull public abstract String[] getSourceToolNames(); /** @@ -56,6 +58,7 @@ public abstract class InspectionElementsMerger { * If this returns an empty string array, the result of getSourceToolNames() is used instead. * @return the suppressIds of the merged inspections. */ + @NotNull public String[] getSuppressIds() { return ArrayUtilRt.EMPTY_STRING_ARRAY; } diff --git a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java index 99915161be33..fc31811426e3 100644 --- a/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java +++ b/platform/analysis-api/src/com/intellij/psi/search/scope/packageSet/NamedScopesHolder.java @@ -81,6 +81,7 @@ public abstract class NamedScopesHolder implements PersistentStateComponent isElementSignificantCondition, boolean areCommentsSignificant) { diff --git a/platform/core-api/src/com/intellij/codeInsight/controlflow/ControlFlow.java b/platform/core-api/src/com/intellij/codeInsight/controlflow/ControlFlow.java index bf72d011c6ea..5151910e3fd9 100644 --- a/platform/core-api/src/com/intellij/codeInsight/controlflow/ControlFlow.java +++ b/platform/core-api/src/com/intellij/codeInsight/controlflow/ControlFlow.java @@ -15,9 +15,12 @@ */ package com.intellij.codeInsight.controlflow; +import org.jetbrains.annotations.NotNull; + /** * @author oleg */ public interface ControlFlow { + @NotNull Instruction[] getInstructions(); } diff --git a/platform/core-api/src/com/intellij/lang/CompositeLanguage.java b/platform/core-api/src/com/intellij/lang/CompositeLanguage.java index d089547eb248..5d362692cc90 100644 --- a/platform/core-api/src/com/intellij/lang/CompositeLanguage.java +++ b/platform/core-api/src/com/intellij/lang/CompositeLanguage.java @@ -47,6 +47,7 @@ public class CompositeLanguage extends Language { return myFilters.remove(filter); } + @NotNull public Language[] getLanguageExtensionsForFile(final PsiFile psi) { final List extensions = new ArrayList<>(1); for (LanguageFilter filter : myFilters) { diff --git a/platform/core-api/src/com/intellij/lang/MetaLanguage.java b/platform/core-api/src/com/intellij/lang/MetaLanguage.java index 100b13a84087..f956c9430786 100644 --- a/platform/core-api/src/com/intellij/lang/MetaLanguage.java +++ b/platform/core-api/src/com/intellij/lang/MetaLanguage.java @@ -32,6 +32,7 @@ public abstract class MetaLanguage extends Language { super(ID); } + @NotNull public static MetaLanguage[] all() { return Extensions.getExtensions(EP_NAME); } diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java index 970ecb8c4a34..9d0a2ba27b2a 100644 --- a/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java +++ b/platform/core-api/src/com/intellij/openapi/fileTypes/FileTypeRegistry.java @@ -40,6 +40,7 @@ public abstract class FileTypeRegistry { * * @return The list of file types. */ + @NotNull public abstract FileType[] getRegisteredFileTypes(); /** diff --git a/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java b/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java index 73a0bec3492a..524d37ba883a 100644 --- a/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java +++ b/platform/core-api/src/com/intellij/openapi/util/BuildNumber.java @@ -42,14 +42,14 @@ public class BuildNumber implements Comparable { private static final BuildNumber CURRENT_VERSION = fromFile(); } - @NotNull private final String myProductCode; - private final int[] myComponents; + @NotNull private final String myProductCode; + @NotNull private final int[] myComponents; public BuildNumber(@NotNull String productCode, int baselineVersion, int buildNumber) { this(productCode, new int[]{baselineVersion, buildNumber}); } - public BuildNumber(@NotNull String productCode, int... components) { + public BuildNumber(@NotNull String productCode, @NotNull int... components) { myProductCode = productCode; myComponents = components; } @@ -221,6 +221,7 @@ public class BuildNumber implements Comparable { return myComponents[1]; } + @NotNull public int[] getComponents() { return myComponents; } diff --git a/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java b/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java index 19f0141b7d78..f0009761d646 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/WritingAccessProvider.java @@ -38,6 +38,7 @@ public abstract class WritingAccessProvider { public abstract boolean isPotentiallyWritable(@NotNull VirtualFile file); + @NotNull public static WritingAccessProvider[] getProvidersForProject(Project project) { return project == null || project.isDefault() ? new WritingAccessProvider[0] : Extensions.getExtensions(EP_NAME, project); } diff --git a/platform/core-api/src/com/intellij/psi/PsiReferenceService.java b/platform/core-api/src/com/intellij/psi/PsiReferenceService.java index d6433a59f3cb..a39988f7949a 100644 --- a/platform/core-api/src/com/intellij/psi/PsiReferenceService.java +++ b/platform/core-api/src/com/intellij/psi/PsiReferenceService.java @@ -47,6 +47,7 @@ public abstract class PsiReferenceService { @NotNull public abstract List getReferences(@NotNull final PsiElement element, @NotNull final Hints hints); + @NotNull public PsiReference[] getContributedReferences(@NotNull final PsiElement element) { final List list = getReferences(element, Hints.NO_HINTS); return list.toArray(new PsiReference[list.size()]); diff --git a/platform/core-api/src/com/intellij/psi/meta/PsiMetaData.java b/platform/core-api/src/com/intellij/psi/meta/PsiMetaData.java index 6e6314a24cbe..f1202f34c54f 100644 --- a/platform/core-api/src/com/intellij/psi/meta/PsiMetaData.java +++ b/platform/core-api/src/com/intellij/psi/meta/PsiMetaData.java @@ -17,6 +17,7 @@ package com.intellij.psi.meta; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; /** * @author peter @@ -39,5 +40,6 @@ public interface PsiMetaData { * @return objects this meta data depends on. * @see com.intellij.psi.util.CachedValue */ + @NotNull Object[] getDependences(); } diff --git a/platform/core-api/src/com/intellij/psi/tree/IElementType.java b/platform/core-api/src/com/intellij/psi/tree/IElementType.java index 6208bcc31789..2a8f8a6c27b5 100644 --- a/platform/core-api/src/com/intellij/psi/tree/IElementType.java +++ b/platform/core-api/src/com/intellij/psi/tree/IElementType.java @@ -57,7 +57,7 @@ public class IElementType { private static final short MAX_INDEXED_TYPES = 15000; private static short size; // guarded by lock - private static volatile IElementType[] ourRegistry; // writes are guarded by lock + private static volatile IElementType[] ourRegistry = EMPTY_ARRAY; // writes are guarded by lock private static final Object lock = new String("registry lock"); static { @@ -67,6 +67,7 @@ public class IElementType { push(init); } + @NotNull static IElementType[] push(@NotNull IElementType[] types) { synchronized (lock) { IElementType[] oldRegistry = ourRegistry; diff --git a/platform/core-api/src/com/intellij/testFramework/BinaryLightVirtualFile.java b/platform/core-api/src/com/intellij/testFramework/BinaryLightVirtualFile.java index a2123060eed0..fb7582782706 100644 --- a/platform/core-api/src/com/intellij/testFramework/BinaryLightVirtualFile.java +++ b/platform/core-api/src/com/intellij/testFramework/BinaryLightVirtualFile.java @@ -42,21 +42,21 @@ public class BinaryLightVirtualFile extends LightVirtualFileBase { this(name, ArrayUtil.EMPTY_BYTE_ARRAY); } - public BinaryLightVirtualFile(@NonNls String name, byte[] content) { + public BinaryLightVirtualFile(@NonNls String name, @NotNull byte[] content) { this(name, null, content, LocalTimeCounter.currentTime()); } - public BinaryLightVirtualFile(final String name, final FileType fileType, final byte[] content) { + public BinaryLightVirtualFile(final String name, final FileType fileType, @NotNull byte[] content) { this(name, fileType, content, LocalTimeCounter.currentTime()); } - public BinaryLightVirtualFile(VirtualFile original, final byte[] content, long modificationStamp) { + public BinaryLightVirtualFile(VirtualFile original, @NotNull byte[] content, long modificationStamp) { this(original.getName(), original.getFileType(), content, modificationStamp); } public BinaryLightVirtualFile(final String name, final FileType fileType, - final byte[] content, + @NotNull byte[] content, final long modificationStamp) { super(name, fileType, modificationStamp); setContent(content); @@ -87,16 +87,17 @@ public class BinaryLightVirtualFile extends LightVirtualFileBase { return myContent; } - public void setContent(Object requestor, byte[] content, boolean fireEvent) { + public void setContent(Object requestor, @NotNull byte[] content, boolean fireEvent) { setContent(content); setModificationStamp(LocalTimeCounter.currentTime()); } - private void setContent(byte[] content) { + private void setContent(@NotNull byte[] content) { //StringUtil.assertValidSeparators(content); myContent = content; } + @NotNull public byte[] getContent() { return myContent; } diff --git a/platform/core-api/src/com/intellij/ui/LayeredIcon.java b/platform/core-api/src/com/intellij/ui/LayeredIcon.java index 9dd20d52436c..7f870c1fdacd 100644 --- a/platform/core-api/src/com/intellij/ui/LayeredIcon.java +++ b/platform/core-api/src/com/intellij/ui/LayeredIcon.java @@ -134,6 +134,7 @@ public class LayeredIcon extends JBUI.AuxScalableJBIcon { return myIcons[layer]; } + @NotNull public Icon[] getAllLayers() { return myIcons; } diff --git a/platform/core-api/src/com/intellij/ui/RowIcon.java b/platform/core-api/src/com/intellij/ui/RowIcon.java index af1214786c6e..69cffbf2782a 100644 --- a/platform/core-api/src/com/intellij/ui/RowIcon.java +++ b/platform/core-api/src/com/intellij/ui/RowIcon.java @@ -70,6 +70,7 @@ public class RowIcon extends JBUI.AuxScalableJBIcon { return new RowIcon(this); } + @NotNull private Icon[] myScaledIcons() { if (myScaledIcons != null) { return myScaledIcons; diff --git a/platform/core-api/src/com/intellij/util/IconUtil.java b/platform/core-api/src/com/intellij/util/IconUtil.java index b67dd6f8b101..af928970092a 100644 --- a/platform/core-api/src/com/intellij/util/IconUtil.java +++ b/platform/core-api/src/com/intellij/util/IconUtil.java @@ -202,6 +202,7 @@ public class IconUtil { private static final FileIconProvider[] myProviders = Extensions.getExtensions(FileIconProvider.EP_NAME); } + @NotNull private static FileIconProvider[] getProviders() { return FileIconProviderHolder.myProviders; } @@ -210,6 +211,7 @@ public class IconUtil { private static final FileIconPatcher[] ourPatchers = Extensions.getExtensions(FileIconPatcher.EP_NAME); } + @NotNull private static FileIconPatcher[] getPatchers() { return FileIconPatcherHolder.ourPatchers; } diff --git a/platform/core-api/src/com/intellij/util/PsiIconUtil.java b/platform/core-api/src/com/intellij/util/PsiIconUtil.java index 485242b1a955..bed9d08cb398 100644 --- a/platform/core-api/src/com/intellij/util/PsiIconUtil.java +++ b/platform/core-api/src/com/intellij/util/PsiIconUtil.java @@ -49,6 +49,7 @@ public class PsiIconUtil { private static final IconProvider[] ourIconProviders = Extensions.getExtensions(IconProvider.EXTENSION_POINT_NAME); } + @NotNull private static IconProvider[] getIconProviders() { return IconProviderHolder.ourIconProviders; } diff --git a/platform/core-api/src/com/intellij/util/indexing/FileContent.java b/platform/core-api/src/com/intellij/util/indexing/FileContent.java index d491870151f7..f26abe1df42c 100644 --- a/platform/core-api/src/com/intellij/util/indexing/FileContent.java +++ b/platform/core-api/src/com/intellij/util/indexing/FileContent.java @@ -37,6 +37,7 @@ public interface FileContent extends UserDataHolder { @NotNull String getFileName(); + @NotNull byte[] getContent(); @NotNull diff --git a/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java b/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java index 33b7f059bdfd..d16e6dcae355 100644 --- a/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java +++ b/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java @@ -47,6 +47,7 @@ public class CoreFileTypeRegistry extends FileTypeRegistry { return false; } + @NotNull @Override public FileType[] getRegisteredFileTypes() { return myAllFileTypes.toArray(new FileType[myAllFileTypes.size()]); diff --git a/platform/core-impl/src/com/intellij/execution/process/CommandLineArgumentsProvider.java b/platform/core-impl/src/com/intellij/execution/process/CommandLineArgumentsProvider.java index c7ca1e1bcf77..fea61d6ecac6 100644 --- a/platform/core-impl/src/com/intellij/execution/process/CommandLineArgumentsProvider.java +++ b/platform/core-impl/src/com/intellij/execution/process/CommandLineArgumentsProvider.java @@ -18,6 +18,7 @@ package com.intellij.execution.process; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Collections; @@ -33,6 +34,7 @@ public class CommandLineArgumentsProvider { /** * @return Commands to execute (one command corresponds to one add argument) */ + @NotNull public String[] getArguments() { return ArrayUtil.EMPTY_STRING_ARRAY; } public boolean passParentEnvs() { return false; } diff --git a/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java b/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java index a07a33f7c79c..0459607ca70a 100644 --- a/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java +++ b/platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java @@ -222,6 +222,7 @@ public abstract class ASTDelegatePsiElement extends PsiElementBase { return nodes.length == 0 ? null : nodes[0].getPsi(); } + @NotNull protected T[] findChildrenByType(IElementType elementType, Class arrayClass) { return ContainerUtil.map2Array(SharedImplUtil.getChildrenOfType(getNode(), elementType), arrayClass, s -> (T)s.getPsi()); } @@ -257,6 +258,7 @@ public abstract class ASTDelegatePsiElement extends PsiElementBase { return result; } + @NotNull protected T[] findChildrenByType(TokenSet elementType, Class arrayClass) { return ContainerUtil.map2Array(getNode().getChildren(elementType), arrayClass, s -> (T)s.getPsi()); } diff --git a/platform/core-impl/src/com/intellij/indentation/OperationParserHelper.java b/platform/core-impl/src/com/intellij/indentation/OperationParserHelper.java index 560f28b73a05..9b0f211b9493 100644 --- a/platform/core-impl/src/com/intellij/indentation/OperationParserHelper.java +++ b/platform/core-impl/src/com/intellij/indentation/OperationParserHelper.java @@ -191,6 +191,7 @@ public class OperationParserHelper { * Provides operation priority and operands * @return array of TokenSets */ + @NotNull TokenSet[] getOperatorsByPriority(); /** @@ -211,6 +212,7 @@ public class OperationParserHelper { * Provides element types to finish binary operation element * @return array of Element Types */ + @NotNull IElementType[] getOperationElementTypes(); } diff --git a/platform/core-impl/src/com/intellij/openapi/editor/impl/BulkChangesMerger.java b/platform/core-impl/src/com/intellij/openapi/editor/impl/BulkChangesMerger.java index 781d7b61139f..a3c237ac0e37 100644 --- a/platform/core-impl/src/com/intellij/openapi/editor/impl/BulkChangesMerger.java +++ b/platform/core-impl/src/com/intellij/openapi/editor/impl/BulkChangesMerger.java @@ -59,6 +59,7 @@ public class BulkChangesMerger { * are sorted by offsets in ascending order * @return merge result */ + @NotNull public char[] mergeToCharArray(@NotNull char[] text, int textLength, @NotNull List changes) { int newLength = textLength; for (TextChange change : changes) { diff --git a/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java b/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java index d6a2bd877ba3..1779dd3188cd 100644 --- a/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java +++ b/platform/core-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java @@ -215,6 +215,7 @@ public class TreeChangeEventImpl implements TreeChangeEvent{ } } + @NotNull private static int[] getRoute(ASTNode node, TObjectIntHashMap index){ final List parents = new ArrayList<>(20); while(node != null){ diff --git a/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java b/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java index 45a2f3b02ff7..19b33007c9ab 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java +++ b/platform/core-impl/src/com/intellij/psi/impl/RenameableFakePsiElement.java @@ -92,6 +92,7 @@ public abstract class RenameableFakePsiElement extends FakePsiElement implements public void init(final PsiElement element) { } + @NotNull @Override public Object[] getDependences() { return ArrayUtil.EMPTY_OBJECT_ARRAY; diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java index 497aab1ae550..fb8d5cec695c 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java @@ -69,6 +69,7 @@ public class PsiMultiReference implements PsiPolyVariantReference { myElement = element; } + @NotNull public PsiReference[] getReferences() { return myReferences; } diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/AstBufferUtil.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/AstBufferUtil.java index d3b09c11b0e4..ea088ff43c05 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/AstBufferUtil.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/AstBufferUtil.java @@ -75,6 +75,7 @@ public class AstBufferUtil { return end; } + @NotNull public char[] getBuffer() { assert buffer != null; return buffer; diff --git a/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java b/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java index d1af65160e4e..7772ce30a039 100644 --- a/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java +++ b/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java @@ -201,6 +201,7 @@ public class FileContentImpl extends UserDataHolderBase implements FileContent { return myStamp; } + @NotNull @Override public byte[] getContent() { if (myContent == null) { diff --git a/platform/extensions/src/com/intellij/openapi/extensions/SortingException.java b/platform/extensions/src/com/intellij/openapi/extensions/SortingException.java index fe5721f96d3c..a0f8d96e1baa 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/SortingException.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/SortingException.java @@ -16,8 +16,8 @@ package com.intellij.openapi.extensions; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Function; import org.jdom.Element; +import org.jetbrains.annotations.NotNull; /** * @author Alexander Kireyev @@ -25,12 +25,13 @@ import org.jdom.Element; public class SortingException extends RuntimeException { private final Element[] myConflictingElements; - public SortingException(String message, Element... conflictingElements) { + SortingException(String message, @NotNull Element... conflictingElements) { super(message + ": " + StringUtil.join(conflictingElements, element -> element.getAttributeValue("id") + "(" + element.getAttributeValue("order") + ")", "; ")); myConflictingElements = conflictingElements; } + @NotNull public Element[] getConflictingElements() { return myConflictingElements; } diff --git a/platform/extensions/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java b/platform/extensions/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java index 5373f257916c..d8614c89772c 100644 --- a/platform/extensions/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java +++ b/platform/extensions/src/com/intellij/util/pico/CachingConstructorInjectionComponentAdapter.java @@ -119,6 +119,7 @@ public class CachingConstructorInjectionComponentAdapter extends InstantiatingCo } } + @NotNull private Object[] getConstructorArguments(PicoContainer container, Constructor ctor) { Class[] parameterTypes = ctor.getParameterTypes(); Object[] result = new Object[parameterTypes.length]; @@ -204,6 +205,7 @@ public class CachingConstructorInjectionComponentAdapter extends InstantiatingCo return matchingConstructors; } + @NotNull private Constructor[] getConstructors() { return (Constructor[]) AccessController.doPrivileged(new PrivilegedAction() { public Object run() { diff --git a/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java b/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java index 2c0239e70887..20efa52f909e 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java +++ b/platform/indexing-api/src/com/intellij/psi/search/PsiReferenceProcessor.java @@ -16,6 +16,7 @@ package com.intellij.psi.search; import com.intellij.psi.PsiReference; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collection; @@ -35,10 +36,12 @@ public interface PsiReferenceProcessor{ this(new ArrayList<>()); } + @NotNull public PsiReference[] toArray(){ return myCollection.toArray(new PsiReference[myCollection.size()]); } + @NotNull public PsiReference[] toArray(PsiReference[] array){ return myCollection.toArray(array); } diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IndexPatternUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IndexPatternUtil.java index 383687a3960d..e4f4f31a80af 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IndexPatternUtil.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/cache/impl/IndexPatternUtil.java @@ -18,10 +18,12 @@ package com.intellij.psi.impl.cache.impl; import com.intellij.openapi.extensions.Extensions; import com.intellij.psi.search.IndexPattern; import com.intellij.psi.search.IndexPatternProvider; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; public class IndexPatternUtil { + @NotNull public static IndexPatternProvider[] getIndexPatternProviders() { return Extensions.getExtensions(IndexPatternProvider.EP_NAME); } @@ -30,6 +32,7 @@ public class IndexPatternUtil { return Arrays.stream(getIndexPatternProviders()).mapToInt(provider -> provider.getIndexPatterns().length).sum(); } + @NotNull public static IndexPattern[] getIndexPatterns() { IndexPattern[] result = new IndexPattern[getIndexPatternCount()]; int destIndex = 0; diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java index 31b26d7ea01a..6f5f5f403b97 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java @@ -183,6 +183,7 @@ public class LowLevelSearchUtil { return processElementsAtOffsets(scope, searcher, processInjectedPsi, progress, occurrences, processor); } + @NotNull static int[] getTextOccurrencesInScope(@NotNull PsiElement scope, @NotNull StringSearcher searcher, ProgressIndicator progress) { if (progress != null) progress.checkCanceled(); @@ -265,6 +266,7 @@ public class LowLevelSearchUtil { return true; } + @NotNull private static int[] getTextOccurrences(@NotNull CharSequence text, int startOffset, int endOffset, diff --git a/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java b/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java index 58067b0a2f61..d4d2b80efd1e 100644 --- a/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java +++ b/platform/indexing-impl/src/com/intellij/psi/search/FilenameIndex.java @@ -43,6 +43,7 @@ public class FilenameIndex { @Deprecated public @NonNls static final ID NAME = ID.create("FilenameIndex"); + @NotNull public static String[] getAllFilenames(Project project) { Set names = new THashSet<>(); getService().processAllFileNames((String s) -> { @@ -68,6 +69,7 @@ public class FilenameIndex { return getVirtualFilesByNameIgnoringCase(name, scope, project, null); } + @NotNull public static PsiFile[] getFilesByName(final Project project, final String name, final GlobalSearchScope scope) { return (PsiFile[])getFilesByName(project, name, scope, false); } @@ -142,6 +144,7 @@ public class FilenameIndex { return files; } + @NotNull public static PsiFileSystemItem[] getFilesByName(final Project project, final String name, @NotNull final GlobalSearchScope scope, diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/GutterIconDescriptor.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/GutterIconDescriptor.java index db8e10de0890..dde382c816c5 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/daemon/GutterIconDescriptor.java +++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/GutterIconDescriptor.java @@ -51,6 +51,7 @@ public abstract class GutterIconDescriptor { return getClass().getName(); } + @NotNull public Option[] getOptions() { return NO_OPTIONS; } diff --git a/platform/lang-api/src/com/intellij/ide/PsiActionSupportFactory.java b/platform/lang-api/src/com/intellij/ide/PsiActionSupportFactory.java index a98c904aa1a6..65bb3b88b0ec 100644 --- a/platform/lang-api/src/com/intellij/ide/PsiActionSupportFactory.java +++ b/platform/lang-api/src/com/intellij/ide/PsiActionSupportFactory.java @@ -19,6 +19,7 @@ package com.intellij.ide; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -31,6 +32,7 @@ public abstract class PsiActionSupportFactory { } public static interface PsiElementSelector { + @NotNull PsiElement[] getSelectedElements(); } diff --git a/platform/lang-api/src/com/intellij/lang/PairedBraceMatcher.java b/platform/lang-api/src/com/intellij/lang/PairedBraceMatcher.java index 1a40637f0fed..5d969ddff08a 100644 --- a/platform/lang-api/src/com/intellij/lang/PairedBraceMatcher.java +++ b/platform/lang-api/src/com/intellij/lang/PairedBraceMatcher.java @@ -37,6 +37,7 @@ public interface PairedBraceMatcher { * * @return the array of brace pair definitions. */ + @NotNull BracePair[] getPairs(); /** diff --git a/platform/lang-api/src/com/intellij/lang/parameterInfo/CreateParameterInfoContext.java b/platform/lang-api/src/com/intellij/lang/parameterInfo/CreateParameterInfoContext.java index e15586e34137..26bb72087d26 100644 --- a/platform/lang-api/src/com/intellij/lang/parameterInfo/CreateParameterInfoContext.java +++ b/platform/lang-api/src/com/intellij/lang/parameterInfo/CreateParameterInfoContext.java @@ -17,8 +17,10 @@ package com.intellij.lang.parameterInfo; import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.Nullable; public interface CreateParameterInfoContext extends ParameterInfoContext { + @Nullable Object[] getItemsToShow(); void setItemsToShow(Object[] items); diff --git a/platform/lang-api/src/com/intellij/psi/util/ReferenceSetBase.java b/platform/lang-api/src/com/intellij/psi/util/ReferenceSetBase.java index b36e17dad4df..26b47c95cefa 100644 --- a/platform/lang-api/src/com/intellij/psi/util/ReferenceSetBase.java +++ b/platform/lang-api/src/com/intellij/psi/util/ReferenceSetBase.java @@ -97,6 +97,7 @@ public abstract class ReferenceSetBase { return myReferences; } + @NotNull public PsiReference[] getPsiReferences() { return myReferences.toArray(new PsiReference[myReferences.size()]); } diff --git a/platform/lang-api/src/com/intellij/semantic/SemKey.java b/platform/lang-api/src/com/intellij/semantic/SemKey.java index 7a0bcf82b20b..844c38def4fa 100644 --- a/platform/lang-api/src/com/intellij/semantic/SemKey.java +++ b/platform/lang-api/src/com/intellij/semantic/SemKey.java @@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class SemKey { private static final AtomicInteger counter = new AtomicInteger(0); private final String myDebugName; - private final SemKey[] mySupers; + @NotNull private final SemKey[] mySupers; private final List myInheritors = ContainerUtil.createEmptyCOWList(); private final int myUniqueId; @@ -54,6 +54,7 @@ public class SemKey { } } + @NotNull public SemKey[] getSupers() { return mySupers; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java b/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java index ac8e8702ae56..4fca34e3c40f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/controlflow/ControlFlowBuilder.java @@ -204,6 +204,7 @@ public class ControlFlowBuilder { } + @FunctionalInterface public interface PendingProcessor { void process(PsiElement pendingScope, Instruction instruction); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/controlflow/impl/ControlFlowImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/controlflow/impl/ControlFlowImpl.java index eccf9469e275..636e6548a2a2 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/controlflow/impl/ControlFlowImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/controlflow/impl/ControlFlowImpl.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.controlflow.impl; import com.intellij.codeInsight.controlflow.ControlFlow; import com.intellij.codeInsight.controlflow.Instruction; +import org.jetbrains.annotations.NotNull; /** * @author oleg @@ -24,10 +25,11 @@ import com.intellij.codeInsight.controlflow.Instruction; public class ControlFlowImpl implements ControlFlow { private final Instruction[] myInstructions; - public ControlFlowImpl(Instruction[] instructions) { + public ControlFlowImpl(@NotNull Instruction[] instructions) { myInstructions = instructions; } + @NotNull @Override public Instruction[] getInstructions() { return myInstructions; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/PairedBraceMatcherAdapter.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/PairedBraceMatcherAdapter.java index d1c385557ce7..3b138085cb07 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/PairedBraceMatcherAdapter.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/PairedBraceMatcherAdapter.java @@ -39,6 +39,7 @@ public class PairedBraceMatcherAdapter implements NontrivialBraceMatcher, Paired myLanguage = language; } + @NotNull @Override public BracePair[] getPairs() { return myMatcher.getPairs(); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionCmdlineOptions.java b/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionCmdlineOptions.java index abe4357e51ba..ff1b481b6d15 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionCmdlineOptions.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/AbstractInspectionCmdlineOptions.java @@ -3,6 +3,7 @@ package com.intellij.codeInspection; import com.intellij.codeInspection.ex.PlainTextFormatter; import com.intellij.openapi.diagnostic.Logger; import com.sampullara.cli.Args; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; @@ -31,6 +32,7 @@ public abstract class AbstractInspectionCmdlineOptions implements InspectionTool @Nullable protected abstract Boolean getRunWithEditorSettingsProperty(); + @NotNull protected abstract String[] optionsBanner(); @Override diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java index 119e952b843a..dcbf40420bd4 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java @@ -135,6 +135,7 @@ public class Descriptor { return element; } + @NotNull public String[] getGroup() { return myGroup; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java index 1ac3afae146c..b8e2df665b0d 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/DescriptorComposer.java @@ -31,6 +31,7 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.text.CharArrayUtil; import com.intellij.xml.util.XmlStringUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.List; @@ -75,6 +76,7 @@ public class DescriptorComposer extends HTMLComposerImpl { } } + @Nullable public static String[] quickFixTexts(RefEntity where, @NotNull InspectionToolPresentation toolPresentation){ QuickFixAction[] quickFixes = toolPresentation.getQuickFixes(new RefEntity[] {where}, null); if (quickFixes == null) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java index 1d96321d93e5..1c4610295eb3 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProvider.java @@ -99,6 +99,7 @@ public abstract class InspectionRVContentProvider { return myEntity == null || myEntity instanceof RefElement && !(myEntity instanceof RefDirectory); //do not show structure for refModule and refPackage } + @NotNull public Descriptor[] getDescriptors() { return myDescriptors; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java index 4d772373dba7..e8b66f46b5c6 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java @@ -229,6 +229,7 @@ public class QuickFixAction extends AnAction implements CustomComponentAction { return readOnlyFiles; } + @NotNull private static RefEntity[] getSelectedElements(InspectionResultsView view) { if (view == null) return new RefElement[0]; List selection = new ArrayList<>(Arrays.asList(view.getTree().getSelectedElements())); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java index cf341aebc5e2..f4b2e430150c 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineDescriptorResolveResult.java @@ -150,6 +150,7 @@ class OfflineDescriptorResolveResult { return null; } + @NotNull private static PsiElement[] getElementsIntersectingRange(PsiFile file, final int startOffset, final int endOffset) { final FileViewProvider viewProvider = file.getViewProvider(); final Set result = new LinkedHashSet<>(); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java index 85c2cdbcc187..5e078300b9bd 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java @@ -1042,6 +1042,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren return null; } + @NotNull private PsiElement[] collectPsiElements() { RefEntity[] refElements = myTree.getSelectedElements(); List psiElements = new ArrayList<>(); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java index b9f5e6b10ca2..964a7da504f4 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java @@ -213,14 +213,17 @@ public class InspectionTree extends Tree { } } + @NotNull public CommonProblemDescriptor[] getAllValidSelectedDescriptors() { return getSelectedDescriptors(false, null, true, false); } + @NotNull public CommonProblemDescriptor[] getSelectedDescriptors() { return getSelectedDescriptors(false, null, false, false); } + @NotNull public CommonProblemDescriptor[] getSelectedDescriptors(boolean sortedByPosition, @Nullable Set readOnlyFilesSink, boolean allowResolved, diff --git a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java index d89866adf9fd..2a6b2317a554 100644 --- a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java +++ b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java @@ -37,6 +37,7 @@ public class CustomFileTypeBraceMatcher implements PairedBraceMatcher { new BracePair(L_BRACE, R_BRACE, true), }; + @NotNull @Override public BracePair[] getPairs() { return PAIRS; diff --git a/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java b/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java index 92989ebba649..64ef64f45d3d 100644 --- a/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java +++ b/platform/lang-impl/src/com/intellij/injected/editor/DocumentWindowImpl.java @@ -818,6 +818,7 @@ public class DocumentWindowImpl extends UserDataHolderBase implements Disposable // result[i] == null means no change // result[i] == "" means delete // result[i] == string means replace + @NotNull public String[] calculateMinEditSequence(String newText) { synchronized (myLock) { String[] result = new String[myShreds.size()]; diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java index c18d074a73e1..4e466b59e7de 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.java @@ -101,6 +101,7 @@ public class FileTypeConfigurable extends BaseConfigurable implements Searchable myRecognizedFileType.setFileTypes(types); } + @NotNull private static FileType[] getModifiableFileTypes() { FileType[] registeredFileTypes = FileTypeManager.getInstance().getRegisteredFileTypes(); ArrayList result = new ArrayList<>(); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java index a813377b4bf1..1362c8336cfc 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceCompletionImpl.java @@ -65,6 +65,7 @@ public class FileReferenceCompletionImpl extends FileReferenceCompletion { } }; + @NotNull @Override public Object[] getFileReferenceCompletionVariants(final FileReference reference) { final String s = reference.getText(); diff --git a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java index 0d759a564d63..6eb2a695ef0c 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringProcessor.java @@ -272,6 +272,7 @@ public abstract class BaseRefactoringProcessor implements Runnable { processUsages(processor, myProject); } + @NotNull @Override protected UsageInfo[] findUsages() { return BaseRefactoringProcessor.this.findUsages(); diff --git a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java index 5a8d802a2269..652c845c34b6 100644 --- a/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java +++ b/platform/lang-impl/src/com/intellij/usageView/UsageViewUtil.java @@ -36,7 +36,6 @@ import com.intellij.refactoring.util.NonCodeUsageInfo; import com.intellij.usages.Usage; import com.intellij.usages.UsageInfo2UsageAdapter; import com.intellij.usages.UsageView; -import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -92,6 +91,7 @@ public class UsageViewUtil { return false; } + @NotNull public static UsageInfo[] removeDuplicatedUsages(@NotNull UsageInfo[] usages) { Set set = new LinkedHashSet<>(Arrays.asList(usages)); diff --git a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java index f0679ab459a1..32819bcfa06e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/ConfigImportSettings.java @@ -33,6 +33,7 @@ public class ConfigImportSettings { return getProductName(ThreeState.NO); } + @NotNull public String[] getMainJarNames() { return new String[]{getProductName(ThreeState.NO)}; } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java index 29e03445fe33..170f743619cb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsData.java @@ -273,6 +273,7 @@ public class VfsData { @NotNull int[] myChildrenIds = ArrayUtil.EMPTY_INT_ARRAY; private Set myAdoptedNames; + @NotNull VirtualFileSystemEntry[] getFileChildren(int fileId, VirtualDirectoryImpl parent) { assert fileId > 0; VirtualFileSystemEntry[] children = new VirtualFileSystemEntry[myChildrenIds.length]; diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java index 7062d6664eef..264201570bce 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VfsRootAccess.java @@ -161,6 +161,7 @@ public class VfsRootAccess { return allowed; } + @NotNull private static VirtualFile[] getAllRoots(@NotNull Project project) { insideGettingRoots = true; final Set roots = new THashSet<>(); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java index 86e2c6ab996e..3d83900317af 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java @@ -211,6 +211,7 @@ public class VirtualDirectoryImpl extends VirtualFileSystemEntry { return child; } + @NotNull private VirtualFileSystemEntry[] getArraySafely() { synchronized (myData) { return myData.getFileChildren(myId, this); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java index 529d951a5cb4..36797c34d321 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualFileSystemEntry.java @@ -27,7 +27,6 @@ import com.intellij.openapi.vfs.encoding.EncodingRegistry; import com.intellij.openapi.vfs.newvfs.NewVirtualFile; import com.intellij.openapi.vfs.newvfs.persistent.PersistentFS; import com.intellij.openapi.vfs.newvfs.persistent.PersistentFSImpl; -import com.intellij.psi.SingleRootFileViewProvider; import com.intellij.util.LocalTimeCounter; import com.intellij.util.text.CharArrayUtil; import com.intellij.util.text.StringFactory; @@ -164,6 +163,7 @@ public abstract class VirtualFileSystemEntry extends NewVirtualFile { } } + @NotNull protected char[] appendPathOnFileSystem(int accumulatedPathLength, int[] positionRef) { CharSequence name = FileNameCache.getVFileName(mySegment.getNameId(myId)); diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java index 0ae2fb856788..4b3f4416000f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java @@ -721,6 +721,7 @@ public class FSRecords { private static final int ROOT_RECORD_ID = 1; + @NotNull static int[] listRoots() { try { r.lock(); @@ -765,7 +766,7 @@ public class FSRecords { } catch (Throwable e) { DbConnection.handleError(e); - return null; + return ArrayUtil.EMPTY_INT_ARRAY; } } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java index 96daf68232b2..0b32d8e8166f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java @@ -1220,10 +1220,8 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone @TestOnly public void cleanPersistedContents() { int[] roots = FSRecords.listRoots(); - if (roots != null) { - for (int root : roots) { - markForContentReloadRecursively(root); - } + for (int root : roots) { + markForContentReloadRecursively(root); } } @@ -1263,6 +1261,7 @@ public class PersistentFSImpl extends PersistentFS implements ApplicationCompone return myName; } + @NotNull @Override protected char[] appendPathOnFileSystem(int pathLength, int[] position) { char[] chars = new char[pathLength + myPathBeforeSlash.length()]; diff --git a/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java b/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java index 846c875c2bfb..6cade77fde03 100644 --- a/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java +++ b/platform/platform-tests/testSrc/com/intellij/psi/impl/meta/MetaRegistryTest.java @@ -77,6 +77,7 @@ public class MetaRegistryTest extends LightPlatformTestCase { return myDeclaration; } + @NotNull @Override public Object[] getDependences() { return new Object[]{myDeclaration}; diff --git a/platform/usageView/src/com/intellij/usages/UsageInfoSearcherAdapter.java b/platform/usageView/src/com/intellij/usages/UsageInfoSearcherAdapter.java index 6979bbdebdc1..8dd16b480a4c 100644 --- a/platform/usageView/src/com/intellij/usages/UsageInfoSearcherAdapter.java +++ b/platform/usageView/src/com/intellij/usages/UsageInfoSearcherAdapter.java @@ -55,5 +55,6 @@ public abstract class UsageInfoSearcherAdapter implements UsageSearcher { } } + @NotNull protected abstract UsageInfo[] findUsages(); } diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index 4bee31ee1edd..5fb68a211c48 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -536,6 +536,7 @@ public class UsageViewImpl implements UsageView { } } + @NotNull private static UsageFilteringRule[] getActiveFilteringRules(final Project project) { final UsageFilteringRuleProvider[] providers = Extensions.getExtensions(UsageFilteringRuleProvider.EP_NAME); List list = new ArrayList<>(providers.length); @@ -545,6 +546,7 @@ public class UsageViewImpl implements UsageView { return list.toArray(new UsageFilteringRule[list.size()]); } + @NotNull private static UsageGroupingRule[] getActiveGroupingRules(@NotNull final Project project) { final UsageGroupingRuleProvider[] providers = Extensions.getExtensions(UsageGroupingRuleProvider.EP_NAME); List list = new ArrayList<>(providers.length); diff --git a/platform/usageView/src/com/intellij/usages/rules/UsageInFiles.java b/platform/usageView/src/com/intellij/usages/rules/UsageInFiles.java index 8b45bc767863..2ea4982c0900 100644 --- a/platform/usageView/src/com/intellij/usages/rules/UsageInFiles.java +++ b/platform/usageView/src/com/intellij/usages/rules/UsageInFiles.java @@ -16,10 +16,12 @@ package com.intellij.usages.rules; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; /** * @author max */ public interface UsageInFiles { + @NotNull VirtualFile[] getFiles(); } diff --git a/platform/util/src/com/intellij/openapi/diff/impl/ComparisonPolicy.java b/platform/util/src/com/intellij/openapi/diff/impl/ComparisonPolicy.java index 29f1cfaa7c6c..9b823c3047de 100644 --- a/platform/util/src/com/intellij/openapi/diff/impl/ComparisonPolicy.java +++ b/platform/util/src/com/intellij/openapi/diff/impl/ComparisonPolicy.java @@ -282,6 +282,7 @@ public abstract class ComparisonPolicy { return new Formatting(text, textRange); } + @NotNull public static ComparisonPolicy[] getAllInstances() { return COMPARISON_POLICIES; } diff --git a/platform/util/src/com/intellij/openapi/diff/impl/highlighting/BufferedStringList.java b/platform/util/src/com/intellij/openapi/diff/impl/highlighting/BufferedStringList.java index d0a84419600d..8f45cd9f5d11 100644 --- a/platform/util/src/com/intellij/openapi/diff/impl/highlighting/BufferedStringList.java +++ b/platform/util/src/com/intellij/openapi/diff/impl/highlighting/BufferedStringList.java @@ -16,6 +16,7 @@ package com.intellij.openapi.diff.impl.highlighting; import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; @@ -39,6 +40,7 @@ class BufferedStringList { } } + @NotNull public String[] toArray() { flushLast(); return ArrayUtil.toStringArray(myStrings); diff --git a/platform/util/src/com/intellij/util/ArrayUtil.java b/platform/util/src/com/intellij/util/ArrayUtil.java index 6d85a1b47797..d19f52de5240 100644 --- a/platform/util/src/com/intellij/util/ArrayUtil.java +++ b/platform/util/src/com/intellij/util/ArrayUtil.java @@ -466,6 +466,7 @@ public class ArrayUtil extends ArrayUtilRt { return result; } + @NotNull private static T[] createArray(@NotNull Class type, int length) { //noinspection unchecked return (T[])Array.newInstance(type, length); diff --git a/platform/util/src/com/intellij/util/containers/ByteArrayList.java b/platform/util/src/com/intellij/util/containers/ByteArrayList.java index 9aad83cc32af..6dfa376a6bb1 100644 --- a/platform/util/src/com/intellij/util/containers/ByteArrayList.java +++ b/platform/util/src/com/intellij/util/containers/ByteArrayList.java @@ -20,6 +20,7 @@ package com.intellij.util.containers; import gnu.trove.HashFunctions; import gnu.trove.TIntProcedure; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.Random; @@ -489,6 +490,7 @@ public class ByteArrayList implements Cloneable { * * @return an {@code int[]} value */ + @NotNull public byte[] toNativeArray() { return toNativeArray(0, _pos); } @@ -500,6 +502,7 @@ public class ByteArrayList implements Cloneable { * @param len the number of values to copy. * @return an {@code int[]} value */ + @NotNull public byte[] toNativeArray(int offset, int len) { byte[] rv = new byte[len]; toNativeArray(rv, offset, len); diff --git a/platform/util/src/com/intellij/util/containers/ByteTrie.java b/platform/util/src/com/intellij/util/containers/ByteTrie.java index 0b393b416af0..94e3c6b03471 100644 --- a/platform/util/src/com/intellij/util/containers/ByteTrie.java +++ b/platform/util/src/com/intellij/util/containers/ByteTrie.java @@ -17,6 +17,7 @@ package com.intellij.util.containers; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; @@ -125,6 +126,7 @@ public class ByteTrie { return index + (((long)resultingLength) << 32); } + @NotNull public byte[] getBytes(int hashCode) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); while (hashCode > 0) { @@ -154,6 +156,7 @@ public class ByteTrie { return index; } + @NotNull public byte[] getReversedBytes(int hashCode) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); while (hashCode > 0) { diff --git a/platform/util/src/com/intellij/util/containers/CharTrie.java b/platform/util/src/com/intellij/util/containers/CharTrie.java index c7b6d8aa2d58..4188b7a227be 100644 --- a/platform/util/src/com/intellij/util/containers/CharTrie.java +++ b/platform/util/src/com/intellij/util/containers/CharTrie.java @@ -111,6 +111,7 @@ public class CharTrie { return index + (((long)resultingLength) << 32); } + @NotNull public char[] getChars(int hashCode) { int length = 0; int run = hashCode; @@ -142,6 +143,7 @@ public class CharTrie { return index; } + @NotNull public char[] getReversedChars(final int hashCode) { int length = 0; int run = hashCode; diff --git a/platform/util/src/com/intellij/util/containers/Queue.java b/platform/util/src/com/intellij/util/containers/Queue.java index d9f2a64c401a..fca7c798107c 100644 --- a/platform/util/src/com/intellij/util/containers/Queue.java +++ b/platform/util/src/com/intellij/util/containers/Queue.java @@ -131,6 +131,7 @@ public class Queue { return normalize(result); } + @NotNull private T[] normalize(T[] result) { if (isWrapped) { int tailLength = copyFromTo(myFirst, myArray.length, result, 0); diff --git a/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java b/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java index 7929d1cdc57b..6d49106fc4c8 100644 --- a/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java +++ b/platform/util/src/com/intellij/util/indexing/containers/ChangeBufferingList.java @@ -15,9 +15,10 @@ */ package com.intellij.util.indexing.containers; -import com.intellij.util.indexing.impl.DebugAssertions; import com.intellij.util.indexing.ValueContainer; +import com.intellij.util.indexing.impl.DebugAssertions; import gnu.trove.TIntProcedure; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; @@ -53,6 +54,7 @@ public class ChangeBufferingList implements Cloneable { checkSet = EXTRA_SANITY_CHECKS ? new IdSet(length) : null; } + @NotNull static int[] calcMinMax(int[] set, int length) { int max = Integer.MIN_VALUE; int min = Integer.MAX_VALUE; diff --git a/platform/util/src/com/intellij/util/io/CompressedAppendableFile.java b/platform/util/src/com/intellij/util/io/CompressedAppendableFile.java index aca6f2fdac58..a3d6df3547a6 100644 --- a/platform/util/src/com/intellij/util/io/CompressedAppendableFile.java +++ b/platform/util/src/com/intellij/util/io/CompressedAppendableFile.java @@ -179,6 +179,7 @@ public class CompressedAppendableFile { private static final FileChunkReadCache ourDecompressedCache = new FileChunkReadCache(); + @NotNull private synchronized byte[] loadChunk(int chunkNumber) throws IOException { try { if (myChunkLengthTable == null) initChunkLengthTable(); @@ -356,6 +357,7 @@ public class CompressedAppendableFile { } } + @NotNull private static short[] reallocShortTable(short[] table) { short[] newTable = new short[Math.max(table.length * 8 / 5, table.length + 1)]; System.arraycopy(table, 0, newTable, 0, table.length); @@ -366,6 +368,7 @@ public class CompressedAppendableFile { return CompressionUtil.writeCompressedWithoutOriginalBufferLength(compressedDataOut, buffer, myAppendBufferLength); } + @NotNull protected byte[] decompress(DataInputStream keysStream) throws IOException { return CompressionUtil.readCompressedWithoutOriginalBufferLength(keysStream); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/FormatDecode.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/FormatDecode.java index 499a71c96079..c2ccd303e789 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/FormatDecode.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/FormatDecode.java @@ -19,6 +19,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiType; import com.intellij.psi.util.InheritanceUtil; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.HashSet; @@ -95,6 +96,7 @@ class FormatDecode { } } + @NotNull public static Validator[] decode(String formatString, int argumentCount) { final ArrayList parameters = new ArrayList<>(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNeverThrownInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNeverThrownInspectionMerger.java index bb05897dc208..6b2742e1817f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNeverThrownInspectionMerger.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ThrowableNeverThrownInspectionMerger.java @@ -16,6 +16,7 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; /** * @author Bas Leijdekkers @@ -27,6 +28,7 @@ public class ThrowableNeverThrownInspectionMerger extends InspectionElementsMerg return "ThrowableNotThrown"; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] {"ThrowableInstanceNeverThrown", "ThrowableResultOfMethodCallIgnored"}; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddToIgnoreIfAnnotatedByListQuickFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddToIgnoreIfAnnotatedByListQuickFix.java index fa235c6d68bc..bea2bc40de94 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddToIgnoreIfAnnotatedByListQuickFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/AddToIgnoreIfAnnotatedByListQuickFix.java @@ -18,10 +18,10 @@ package com.siyeh.ig.fixes; import com.intellij.codeInsight.daemon.QuickFixBundle; import com.intellij.codeInspection.util.SpecialAnnotationsUtilBase; import com.intellij.psi.PsiModifierListOwner; -import com.intellij.util.Processor; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.DelegatingFix; import com.siyeh.ig.InspectionGadgetsFix; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; @@ -33,6 +33,7 @@ public class AddToIgnoreIfAnnotatedByListQuickFix { private AddToIgnoreIfAnnotatedByListQuickFix() {} + @NotNull public static InspectionGadgetsFix[] build(PsiModifierListOwner modifierListOwner, List configurationList) { final List fixes = build(modifierListOwner, configurationList, new ArrayList()); return fixes.isEmpty() ? InspectionGadgetsFix.EMPTY_ARRAY : fixes.toArray(new InspectionGadgetsFix[fixes.size()]); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java index 3e44edc42c32..924293c6b09f 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java @@ -20,10 +20,8 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.MethodSignatureBackedByPsiMethod; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.psi.util.PsiUtil; -import com.intellij.util.Processor; import com.siyeh.ig.psiutils.ClassUtils; import com.siyeh.ig.psiutils.TypeUtils; import org.jetbrains.annotations.NonNls; @@ -251,21 +249,25 @@ public class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { return cache; } + @NotNull public MemberSignature[] getNonPrivateConstructors() { init(); return nonPrivateConstructors.toArray(new MemberSignature[nonPrivateConstructors.size()]); } + @NotNull public MemberSignature[] getNonPrivateFields() { init(); return nonPrivateFields.toArray(new MemberSignature[nonPrivateFields.size()]); } + @NotNull public MemberSignature[] getNonPrivateMethodSignatures() { init(); return nonPrivateMethods.toArray(new MemberSignature[nonPrivateMethods.size()]); } + @NotNull public MemberSignature[] getStaticInitializers() { init(); return staticInitializers.toArray(new MemberSignature[staticInitializers.size()]); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/ImportsAreUsedVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/ImportsAreUsedVisitor.java index 2d9bed545d2f..f12939c48547 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/ImportsAreUsedVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/imports/ImportsAreUsedVisitor.java @@ -142,6 +142,7 @@ class ImportsAreUsedVisitor extends JavaRecursiveElementWalkingVisitor { return null; } + @NotNull PsiImportStatementBase[] getUnusedImportStatements() { if (importStatements.isEmpty()) { return PsiImportStatementBase.EMPTY_ARRAY; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MethodDoesntCallSuperMethodInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MethodDoesntCallSuperMethodInspectionMerger.java index b5db593406b3..17ffb0b56e38 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MethodDoesntCallSuperMethodInspectionMerger.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/MethodDoesntCallSuperMethodInspectionMerger.java @@ -16,6 +16,7 @@ package com.siyeh.ig.inheritance; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; /** * @author Bas Leijdekkers @@ -27,6 +28,7 @@ public class MethodDoesntCallSuperMethodInspectionMerger extends InspectionEleme return "RefusedBequest"; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] { @@ -38,6 +40,7 @@ public class MethodDoesntCallSuperMethodInspectionMerger extends InspectionEleme }; } + @NotNull @Override public String[] getSuppressIds() { return new String[] { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java index 44bbf9d4cc52..ddc276e8ada7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/CallToSuspiciousStringMethodInspectionMerger.java @@ -16,6 +16,7 @@ package com.siyeh.ig.internationalization; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; /** * @author Bas Leijdekkers @@ -27,6 +28,7 @@ public class CallToSuspiciousStringMethodInspectionMerger extends InspectionElem return "CallToSuspiciousStringMethod"; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] { @@ -36,6 +38,7 @@ public class CallToSuspiciousStringMethodInspectionMerger extends InspectionElem }; } + @NotNull @Override public String[] getSuppressIds() { return new String[] { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java index 8f6bfef107c1..fb187c4b4f16 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspectionMerger.java @@ -16,6 +16,7 @@ package com.siyeh.ig.junit; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; /** * @author Bas Leijdekkers @@ -27,11 +28,13 @@ public class MalformedSetUpTearDownInspectionMerger extends InspectionElementsMe return "MalformedSetUpTearDown"; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] { "TeardownIsPublicVoidNoArg", "SetupIsPublicVoidNoArg" }; } + @NotNull @Override public String[] getSuppressIds() { return new String[] { "TearDownWithIncorrectSignature", "SetUpWithIncorrectSignature" }; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ConventionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ConventionInspection.java index e598028c7c91..d95738818dbc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ConventionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ConventionInspection.java @@ -104,6 +104,7 @@ public abstract class ConventionInspection extends BaseInspection { m_regexPattern = Pattern.compile(m_regex); } + @NotNull public JComponent[] createExtraOptions() { return EMPTY_JCOMPONENT_ARRAY; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/MisspelledMethodNameInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/MisspelledMethodNameInspectionMerger.java index 2e315faa9ac7..5e1a3c86de7c 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/MisspelledMethodNameInspectionMerger.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/MisspelledMethodNameInspectionMerger.java @@ -16,6 +16,7 @@ package com.siyeh.ig.naming; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; public class MisspelledMethodNameInspectionMerger extends InspectionElementsMerger { @@ -24,6 +25,7 @@ public class MisspelledMethodNameInspectionMerger extends InspectionElementsMerg return "MisspelledMethodName"; } + @NotNull @Override public String[] getSourceToolNames() { return new String[]{"MethodNamesDifferOnlyByCase", "MisspelledSetUp", "MisspelledTearDown", "MisspelledHashcode", "MisspelledToString", "MisspelledCompareTo"}; diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/StaticVariableNamingConventionInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/StaticVariableNamingConventionInspectionBase.java index 34c689e498d1..4a14af7895e0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/StaticVariableNamingConventionInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/StaticVariableNamingConventionInspectionBase.java @@ -63,6 +63,7 @@ public class StaticVariableNamingConventionInspectionBase extends ConventionInsp return DEFAULT_MAX_LENGTH; } + @NotNull @Override public JComponent[] createExtraOptions() { return new JComponent[]{ diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SingletonUtil.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SingletonUtil.java index 802ae601cf5b..74d2eef43fa5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SingletonUtil.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/SingletonUtil.java @@ -67,6 +67,7 @@ public class SingletonUtil { return aClass.equals(targetClass); } + @NotNull private static PsiMethod[] getIfOnlyInvisibleConstructors(PsiClass aClass) { final PsiMethod[] constructors = aClass.getConstructors(); if (constructors.length == 0) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java index cb973d9bcaa2..9e5472ed9196 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/UninitializedReadCollector.java @@ -33,6 +33,7 @@ public class UninitializedReadCollector { uninitializedReads = new HashSet<>(); } + @NotNull public PsiExpression[] getUninitializedReads() { return uninitializedReads.toArray(new PsiExpression[uninitializedReads.size()]); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableHasSerializationMethodsInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableHasSerializationMethodsInspectionBase.java index ee3f070a006e..1051fbb4c1ff 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableHasSerializationMethodsInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableHasSerializationMethodsInspectionBase.java @@ -58,6 +58,7 @@ public class SerializableHasSerializationMethodsInspectionBase } } + @NotNull @Override protected JComponent[] createAdditionalOptions() { return new JComponent[] {new CheckBox(InspectionGadgetsBundle.message("serializable.has.serialization.methods.ignore.option"), diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableInspectionBase.java index 72476b4488e7..6d226f07b9b5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableInspectionBase.java @@ -48,6 +48,7 @@ public abstract class SerializableInspectionBase extends BaseInspection { super.writeSettings(node); } + @NotNull protected JComponent[] createAdditionalOptions() { return EMPTY_COMPONENT_ARRAY; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspectionMerger.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspectionMerger.java index b1a30f2bae92..17eea3fed262 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspectionMerger.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/WaitNotifyNotInSynchronizedContextInspectionMerger.java @@ -16,6 +16,7 @@ package com.siyeh.ig.threading; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; /** * @author Bas Leijdekkers @@ -26,6 +27,7 @@ public class WaitNotifyNotInSynchronizedContextInspectionMerger extends Inspecti return "WaitNotifyNotInSynchronizedContext"; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] { @@ -34,6 +36,7 @@ public class WaitNotifyNotInSynchronizedContextInspectionMerger extends Inspecti }; } + @NotNull @Override public String[] getSuppressIds() { return new String[]{ diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java index a8c510ef4bcd..bb46b36035b6 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesOuterClassVariableVisitor.java @@ -18,6 +18,7 @@ package com.siyeh.ig.visibility; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.siyeh.ig.BaseInspectionVisitor; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.HashMap; @@ -101,6 +102,7 @@ class AnonymousClassVariableHidesOuterClassVariableVisitor extends BaseInspectio // don't drill down in classes } + @NotNull public PsiVariable[] getVariables(String name) { final List variableList = variableMap.get(name); if (variableList == null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java index 76d058189178..e0ca212c104f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ConstantNamingConventionInspection.java @@ -19,6 +19,7 @@ import com.intellij.util.ui.CheckBox; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.RenameFix; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -29,6 +30,7 @@ public class ConstantNamingConventionInspection extends ConstantNamingConvention return new RenameFix(); } + @NotNull @Override public JComponent[] createExtraOptions() { return new JComponent[] { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java index d1af47d76166..712ed31e6eeb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/LocalVariableNamingConventionInspection.java @@ -19,6 +19,7 @@ import com.intellij.util.ui.CheckBox; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.RenameFix; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -29,6 +30,7 @@ public class LocalVariableNamingConventionInspection extends LocalVariableNaming return new RenameFix(); } + @NotNull @Override public JComponent[] createExtraOptions() { return new JComponent[] { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableFieldInSerializableClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableFieldInSerializableClassInspection.java index 4b13177fee94..ff34abe1d8a5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableFieldInSerializableClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableFieldInSerializableClassInspection.java @@ -17,6 +17,7 @@ package com.siyeh.ig.serialization; import com.intellij.codeInspection.util.SpecialAnnotationsUtil; import com.siyeh.InspectionGadgetsBundle; +import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -26,6 +27,7 @@ public class NonSerializableFieldInSerializableClassInspection extends NonSerial return SerializableInspectionUtil.createOptions(this); } + @NotNull @Override protected JComponent[] createAdditionalOptions() { return new JComponent[]{SpecialAnnotationsUtil.createSpecialAnnotationsListControl( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesInaccessibleMethodMerger.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesInaccessibleMethodMerger.java index 5ab2d9b08856..b1659cf55636 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesInaccessibleMethodMerger.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesInaccessibleMethodMerger.java @@ -16,6 +16,7 @@ package com.siyeh.ig.visibility; import com.intellij.codeInspection.ex.InspectionElementsMerger; +import org.jetbrains.annotations.NotNull; public class MethodOverridesInaccessibleMethodMerger extends InspectionElementsMerger { @Override @@ -23,11 +24,13 @@ public class MethodOverridesInaccessibleMethodMerger extends InspectionElementsM return "MethodOverridesInaccessibleMethodOfSuper"; } + @NotNull @Override public String[] getSourceToolNames() { return new String[] { "MethodOverridesPackageLocalMethod", "MethodOverridesPrivateMethod"}; } + @NotNull @Override public String[] getSuppressIds() { return new String[] {"MethodOverridesPrivateMethodOfSuperclass", "MethodOverridesPrivateMethodOfSuperclass" }; diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManager.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManager.java index 97279e84211e..4b8c711b2fc3 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManager.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManager.java @@ -82,6 +82,7 @@ public abstract class CoverageDataManager implements ProjectComponent, JDOMExter /** * @return registered suites */ + @NotNull public abstract CoverageSuite[] getSuites(); /** diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManagerImpl.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManagerImpl.java index f5a2e43a1e2a..5a00f992bbcf 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManagerImpl.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageDataManagerImpl.java @@ -260,6 +260,7 @@ public class CoverageDataManagerImpl extends CoverageDataManager { } } + @NotNull public CoverageSuite[] getSuites() { return myCoverageSuites.toArray(new CoverageSuite[myCoverageSuites.size()]); } diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageEngine.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageEngine.java index ed65822ad005..1b31837a62a3 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageEngine.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageEngine.java @@ -329,7 +329,8 @@ public abstract class CoverageEngine { return false; } - public Object[] postProcessExecutableLines(Object[] lines, Editor editor) { + @NotNull + public Object[] postProcessExecutableLines(@NotNull Object[] lines, Editor editor) { return lines; } diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java index 7cf1c08144f1..24f87080b4bd 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java @@ -100,6 +100,7 @@ public class CoverageOptionsConfigurable implements SearchableConfigurable, Conf return panel; } + @NotNull private CoverageOptions[] getExtensions() { return Extensions.getExtensions(CoverageOptions.EP_NAME, myProject); } diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageSuitesBundle.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageSuitesBundle.java index 998468f9a2cc..ccd123778b56 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageSuitesBundle.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageSuitesBundle.java @@ -135,6 +135,7 @@ public class CoverageSuitesBundle { return myEngine.getCoverageAnnotator(project); } + @NotNull public CoverageSuite[] getSuites() { return mySuites; } diff --git a/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java b/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java index 87fac79cea76..fb0446ceee30 100644 --- a/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java +++ b/plugins/coverage/src/com/intellij/coverage/JavaCoverageEngine.java @@ -302,6 +302,7 @@ public class JavaCoverageEngine extends CoverageEngine { @Override public Set getQualifiedNames(@NotNull final PsiFile sourceFile) { final PsiClass[] classes = ApplicationManager.getApplication().runReadAction(new Computable() { + @NotNull public PsiClass[] compute() { return ((PsiClassOwner)sourceFile).getClasses(); } @@ -367,6 +368,7 @@ public class JavaCoverageEngine extends CoverageEngine { } final PsiClass[] classes = ApplicationManager.getApplication().runReadAction(new Computable() { + @NotNull public PsiClass[] compute() { return ((PsiClassOwner)srcFile).getClasses(); } diff --git a/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java b/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java index 95ad637585cf..a18cbbb32893 100644 --- a/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java +++ b/plugins/coverage/src/com/intellij/coverage/view/JavaCoverageViewExtension.java @@ -26,6 +26,7 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ui.ColumnInfo; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; @@ -187,6 +188,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension { private void collectSubPackages(List children, final PsiPackage rootPackage) { final GlobalSearchScope searchScope = mySuitesBundle.getSearchScope(rootPackage.getProject()); final PsiPackage[] subPackages = ApplicationManager.getApplication().runReadAction(new Computable() { + @NotNull public PsiPackage[] compute() { return rootPackage.getSubPackages(searchScope); } @@ -229,6 +231,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension { } })) { final PsiPackage[] subPackages = ApplicationManager.getApplication().runReadAction(new Computable() { + @NotNull public PsiPackage[] compute() { return psiPackage.isValid() ? psiPackage.getSubPackages(mySuitesBundle.getSearchScope(node.getProject())) @@ -240,6 +243,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension { } final PsiFile[] childFiles = ApplicationManager.getApplication().runReadAction(new Computable() { + @NotNull public PsiFile[] compute() { return psiPackage.isValid() ? psiPackage.getFiles(mySuitesBundle.getSearchScope(node.getProject())) @@ -272,6 +276,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension { protected void collectFileChildren(final PsiFile file, AbstractTreeNode node, List children) { if (file instanceof PsiClassOwner) { PsiClass[] classes = ApplicationManager.getApplication().runReadAction(new Computable() { + @NotNull public PsiClass[] compute() { return file.isValid() ? ((PsiClassOwner) file).getClasses() : PsiClass.EMPTY_ARRAY; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocInlinedTagImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocInlinedTagImpl.java index 72f920ce115c..16fe77852c5e 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocInlinedTagImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocInlinedTagImpl.java @@ -85,6 +85,7 @@ public class GrDocInlinedTagImpl extends GroovyDocPsiElementImpl implements GrDo return findChildByClass(GrDocTagValueToken.class); } + @NotNull @Override public PsiElement[] getDataElements() { final List list = findChildrenByType(VALUE_BIT_SET); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocTagImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocTagImpl.java index 9c14f563cf0f..eb49cae20fe5 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocTagImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocTagImpl.java @@ -89,6 +89,7 @@ public class GrDocTagImpl extends GroovyDocPsiElementImpl implements GrDocTag { return findChildByClass(GrDocParameterReference.class); } + @NotNull @Override public PsiElement[] getDataElements() { final List list = findChildrenByType(VALUE_BIT_SET); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeParameterList.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeParameterList.java index 16745275abc8..2b7221fefbe6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeParameterList.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/api/types/GrTypeParameterList.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.lang.psi.api.types; +import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; import com.intellij.psi.PsiTypeParameterList; @@ -23,6 +24,7 @@ import com.intellij.psi.PsiTypeParameterList; * @author ilyas */ public interface GrTypeParameterList extends GroovyPsiElement, PsiTypeParameterList { + @NotNull @Override GrTypeParameter[] getTypeParameters(); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java index d985fc845f49..32069af4e48e 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java @@ -249,6 +249,7 @@ public abstract class GrTypeDefinitionImpl extends GrStubElementBase return GrClassImplUtil.getSuperClass(this); } + @NotNull @Override public PsiClass[] getInterfaces() { return PsiClass.EMPTY_ARRAY; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java index 94daeaad47f5..6934482c2650 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterListImpl.java @@ -51,6 +51,7 @@ public class GrTypeParameterListImpl extends GrStubElementBase implem return "Type parameter list"; } + @NotNull @Override public GrTypeParameter[] getTypeParameters() { return getStubOrPsiChildren(GroovyElementTypes.TYPE_PARAMETER, ARRAY_FACTORY); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java index 5be0698908bb..d28b87e5c2f7 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java @@ -179,6 +179,7 @@ public class GrClassImplUtil { } + @NotNull public static PsiClass[] getInterfaces(GrTypeDefinition grType) { final PsiClassType[] implementsListTypes = grType.getImplementsListTypes(); List result = new ArrayList<>(implementsListTypes.length); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java index d4b67e1540bf..b3e2d55ea964 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/editor/GroovyReferenceCopyPasteProcessor.java @@ -22,6 +22,7 @@ import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.GrReferenceElement; import org.jetbrains.plugins.groovy.lang.psi.api.GroovyResolveResult; @@ -67,6 +68,7 @@ public class GroovyReferenceCopyPasteProcessor extends CopyPasteReferenceProcess } + @NotNull @Override protected GrReferenceElement[] findReferencesToRestore(PsiFile file, RangeMarker bounds, diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java index d5ee505c0588..3dcc56713b40 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java @@ -46,6 +46,7 @@ public class GroovyBraceMatcher implements PairedBraceMatcher { new BracePair(GroovyTokenTypes.mDOLLAR_SLASH_REGEX_BEGIN, GroovyTokenTypes.mDOLLAR_SLASH_REGEX_END, false), }; + @NotNull @Override public BracePair[] getPairs() { return PAIRS; diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java index d422b7e5defb..2671b46fdd50 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxNamespaceDescriptor.java @@ -86,6 +86,7 @@ public class JavaFxNamespaceDescriptor implements XmlNSDescriptor, Validator implements PsiWritableMetaData, P return myElement.getGenericInfo().getNameDomElement(t); } + @NotNull @Override public Object[] getDependences() { final PsiElement declaration = getDeclaration(); diff --git a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java index 8437863e975a..bf7baa28124f 100644 --- a/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java +++ b/xml/relaxng/src/org/intellij/html/RelaxedHtmlFromRngElementDescriptor.java @@ -132,6 +132,7 @@ public class RelaxedHtmlFromRngElementDescriptor implements XmlElementDescriptor myDelegate.init(element); } + @NotNull @Override public Object[] getDependences() { return myDelegate.getDependences(); diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java index 067cc73e420c..117a3e07c55f 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RngCompactLanguage.java @@ -83,6 +83,7 @@ public class RngCompactLanguage extends Language { public static class MyPairedBraceMatcher implements PairedBraceMatcher { private BracePair[] myBracePairs; + @NotNull @Override public BracePair[] getPairs() { if (myBracePairs == null) { diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java index b365b32bcf0b..3ddc520f5cbf 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java @@ -179,6 +179,7 @@ public class RncDefineImpl extends RncElementImpl implements RncDefine, PsiMetaO public void init(PsiElement element) { } + @NotNull @Override public Object[] getDependences() { return ArrayUtil.EMPTY_OBJECT_ARRAY; diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java index 70207576fd44..1f1e7d72c6c0 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngElementDescriptor.java @@ -37,6 +37,7 @@ import org.intellij.plugins.relaxNG.compact.RncElementTypes; import org.intellij.plugins.relaxNG.compact.RncFileType; import org.intellij.plugins.relaxNG.validation.RngSchemaValidator; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.kohsuke.rngom.digested.*; import org.kohsuke.rngom.nc.NameClass; @@ -355,6 +356,7 @@ public class RngElementDescriptor implements XmlElementDescriptor { return myElementPattern.hashCode(); } + @NotNull @Override public Object[] getDependences() { if (myDeclaration != null) { diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java index f1c58d86f501..598cb571fb6b 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngNsDescriptor.java @@ -245,6 +245,7 @@ public class RngNsDescriptor implements XmlNSDescriptorEx, Validator { return getDescriptorFile().getName(); } + @NotNull @Override public Object[] getDependences() { if (myPattern != null) { diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java index eb5b29cf9551..aaf8c8762e4a 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/descriptors/RngXmlAttributeDescriptor.java @@ -188,6 +188,7 @@ public class RngXmlAttributeDescriptor extends BasicXmlAttributeDescriptor { } + @NotNull @Override public Object[] getDependences() { return myElementDescriptor.getDependences(); diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java index a0fa0c9ed2c1..ad2868911d4e 100644 --- a/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java +++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/HighlightingTestBase.java @@ -222,6 +222,7 @@ public abstract class HighlightingTestBase extends UsefulTestCase implements Ide } private static class DefaultInspectionProvider implements InspectionToolProvider { + @NotNull @Override public Class[] getInspectionClasses() { return new Class[]{ diff --git a/xml/tests/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java b/xml/tests/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java index 1728ff9d8e8e..c1584d3a1e6c 100644 --- a/xml/tests/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java +++ b/xml/tests/src/com/intellij/codeInspection/htmlInspections/XmlInspectionToolProvider.java @@ -18,11 +18,13 @@ package com.intellij.codeInspection.htmlInspections; import com.intellij.codeInsight.daemon.impl.analysis.*; import com.intellij.codeInspection.InspectionToolProvider; import com.intellij.xml.util.*; +import org.jetbrains.annotations.NotNull; /** * @author yole */ public class XmlInspectionToolProvider implements InspectionToolProvider { + @NotNull @Override public Class[] getInspectionClasses() { return new Class[] { diff --git a/xml/xml-analysis-api/src/com/intellij/xml/XmlTagRuleProvider.java b/xml/xml-analysis-api/src/com/intellij/xml/XmlTagRuleProvider.java index b81172014831..987f5fe14d35 100644 --- a/xml/xml-analysis-api/src/com/intellij/xml/XmlTagRuleProvider.java +++ b/xml/xml-analysis-api/src/com/intellij/xml/XmlTagRuleProvider.java @@ -24,6 +24,7 @@ public abstract class XmlTagRuleProvider { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.xml.xmlTagRuleProvider"); + @NotNull public abstract Rule[] getTagRule(@NotNull XmlTag tag); public static class Rule { diff --git a/xml/xml-analysis-impl/src/com/intellij/xml/util/TagSetRuleProvider.java b/xml/xml-analysis-impl/src/com/intellij/xml/util/TagSetRuleProvider.java index a3bef9d3ca2e..6916ad134bcc 100644 --- a/xml/xml-analysis-impl/src/com/intellij/xml/util/TagSetRuleProvider.java +++ b/xml/xml-analysis-impl/src/com/intellij/xml/util/TagSetRuleProvider.java @@ -35,6 +35,7 @@ public abstract class TagSetRuleProvider extends XmlTagRuleProviderBase { protected abstract void initMap(TagsRuleMap map, @NotNull String version); + @NotNull @Override public Rule[] getTagRule(@NotNull XmlTag tag) { String namespace = getNamespace(tag); @@ -43,6 +44,7 @@ public abstract class TagSetRuleProvider extends XmlTagRuleProviderBase { return getTagRule(tag, namespace); } + @NotNull public Rule[] getTagRule(@NotNull XmlTag tag, String namespace) { TagsRuleMap ruleMap = map.get(namespace); if (ruleMap == null) { diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java index eaa52b87534f..ffa6305c49fd 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlAttributeDescriptorImpl.java @@ -21,6 +21,7 @@ import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.impl.BasicXmlAttributeDescriptor; import com.intellij.xml.impl.XmlEnumerationDescriptor; +import org.jetbrains.annotations.NotNull; /** * @author Maxim.Mossienko @@ -96,6 +97,7 @@ public class HtmlAttributeDescriptorImpl extends BasicXmlAttributeDescriptor { delegate.init(element); } + @NotNull @Override public Object[] getDependences() { return ArrayUtil.EMPTY_OBJECT_ARRAY; diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java index 491477a4eb80..ddc1ae620420 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlElementDescriptorImpl.java @@ -26,6 +26,7 @@ import com.intellij.xml.impl.dtd.BaseXmlElementDescriptorImpl; import com.intellij.xml.impl.schema.XmlNSDescriptorImpl; import com.intellij.xml.util.HtmlUtil; import com.intellij.xml.util.XmlUtil; +import org.jetbrains.annotations.NotNull; import java.util.HashMap; @@ -194,6 +195,7 @@ public class HtmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl { myDelegate.init(element); } + @NotNull @Override public Object[] getDependences() { return myDelegate.getDependences(); diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java index e58aab4cb669..6a5eca6658f0 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/html/dtd/HtmlNSDescriptorImpl.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.xml.XmlDocument; import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; +import com.intellij.util.ArrayUtil; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; @@ -147,9 +148,10 @@ public class HtmlNSDescriptorImpl implements XmlNSDescriptor, DumbAware, XmlNSTy myDelegate.init(element); } + @NotNull @Override public Object[] getDependences() { - return myDelegate == null ? null : myDelegate.getDependences(); + return myDelegate == null ? ArrayUtil.EMPTY_OBJECT_ARRAY : myDelegate.getDependences(); } @Override diff --git a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java index 71a18ab3f605..ccc69040be5e 100644 --- a/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/psi/impl/source/xml/XmlAttributeValueImpl.java @@ -179,6 +179,7 @@ public class XmlAttributeValueImpl extends XmlElementImpl implements XmlAttribut public void init(final PsiElement element) { } + @NotNull @Override public Object[] getDependences() { return ArrayUtil.EMPTY_OBJECT_ARRAY; diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java index 01d5222fc5af..bb4b68a5386b 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlAttributeDescriptorImpl.java @@ -23,6 +23,7 @@ import com.intellij.psi.xml.XmlElement; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.xml.impl.BasicXmlAttributeDescriptor; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; @@ -71,6 +72,7 @@ public class XmlAttributeDescriptorImpl extends BasicXmlAttributeDescriptor impl myEnumerated = myDecl.isEnumerated(); } + @NotNull @Override public Object[] getDependences(){ return new Object[]{myDecl}; diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java index 0f39bf556951..a04f9c3bef31 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlElementDescriptorImpl.java @@ -92,6 +92,7 @@ public class XmlElementDescriptorImpl extends BaseXmlElementDescriptorImpl imple myElementDecl = (XmlElementDecl) element; } + @NotNull @Override @SuppressWarnings("SpellCheckingInspection") public Object[] getDependences(){ diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java index befece2a0ac7..c3f9593719e0 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/dtd/XmlNSDescriptorImpl.java @@ -185,6 +185,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator myDescriptorTag = (XmlTag) element; } + @NotNull @Override public Object[] getDependences(){ return new Object[]{myDescriptorTag}; diff --git a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java index 5f4c87caa05d..d8a5e8c8dc35 100644 --- a/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java +++ b/xml/xml-psi-impl/src/com/intellij/xml/impl/schema/XmlNSDescriptorImpl.java @@ -938,6 +938,7 @@ public class XmlNSDescriptorImpl implements XmlNSDescriptorEx,Validator ret = new ArrayList<>();