From d19ab39b010ff34ed3b08170b6331067d1b35baf Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Tue, 20 Oct 2015 16:56:51 +0300 Subject: [PATCH] Add missing @NotNull annotations on arguments of PyFile#find* methods --- python/psi-api/src/com/jetbrains/python/psi/PyFile.java | 6 +++--- python/src/com/jetbrains/python/psi/impl/PyFileImpl.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/psi-api/src/com/jetbrains/python/psi/PyFile.java b/python/psi-api/src/com/jetbrains/python/psi/PyFile.java index d1ed51b037be..2640a4f31c4f 100644 --- a/python/psi-api/src/com/jetbrains/python/psi/PyFile.java +++ b/python/psi-api/src/com/jetbrains/python/psi/PyFile.java @@ -35,13 +35,13 @@ public interface PyFile extends PyElement, PsiFile, PyDocStringOwner, ScopeOwner List getTopLevelAttributes(); @Nullable - PyFunction findTopLevelFunction(String name); + PyFunction findTopLevelFunction(@NotNull String name); @Nullable - PyClass findTopLevelClass(String name); + PyClass findTopLevelClass(@NotNull String name); @Nullable - PyTargetExpression findTopLevelAttribute(String name); + PyTargetExpression findTopLevelAttribute(@NotNull String name); LanguageLevel getLanguageLevel(); diff --git a/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java index 86a1af6e518c..1fa8b886c6d6 100644 --- a/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java +++ b/python/src/com/jetbrains/python/psi/impl/PyFileImpl.java @@ -215,22 +215,22 @@ public class PyFileImpl extends PsiFileBase implements PyFile, PyExpression { } @Override - public PyFunction findTopLevelFunction(String name) { + public PyFunction findTopLevelFunction(@NotNull String name) { return findByName(name, getTopLevelFunctions()); } @Override - public PyClass findTopLevelClass(String name) { + public PyClass findTopLevelClass(@NotNull String name) { return findByName(name, getTopLevelClasses()); } @Override - public PyTargetExpression findTopLevelAttribute(String name) { + public PyTargetExpression findTopLevelAttribute(@NotNull String name) { return findByName(name, getTopLevelAttributes()); } @Nullable - private static T findByName(String name, List namedElements) { + private static T findByName(@NotNull String name, @NotNull List namedElements) { for (T namedElement : namedElements) { if (name.equals(namedElement.getName())) { return namedElement;