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

notnull

Browse Source 
GitOrigin-RevId: 8f6ed7dd8c472f6994b397562541c7811cbda23e
This commit is contained in:
Alexey Kudravtsev
2021-05-25 04:16:41 +02:00
committed by intellij-monorepo-bot
parent 6dbc2b96cf
commit 768576d6dc
4 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/typeMigration/test/com/intellij/codeInsight/inspections/GuavaInspectionTest.java
View File

@@ -16,6 +16,7 @@ import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.List;
@@ -289,7 +290,7 @@ public class GuavaInspectionTest extends JavaCodeInsightFixtureTestCase {
doTest();
}
private void doTestNoQuickFixes(Class<? extends PsiElement>... highlightedElements) {
private void doTestNoQuickFixes(@NotNull Class<? extends PsiElement> @NotNull ... highlightedElements) {
myFixture.configureByFile(getTestName(true) + ".java");
myFixture.doHighlighting();

28
platform/core-api/src/com/intellij/psi/util/PsiTreeUtil.java
View File

@@ -266,8 +266,8 @@ public class PsiTreeUtil {
@SafeVarargs
@Contract("null, _, _ -> null")
public static @Nullable <T extends PsiElement> T findChildOfAnyType(@Nullable PsiElement element,
boolean strict,
Class<? extends T> @NotNull ... classes) {
boolean strict,
@NotNull Class<? extends T> @NotNull ... classes) {
if (element == null) return null;
FindElement<PsiElement> processor = new FindElement<PsiElement>() {
@@ -309,8 +309,8 @@ public class PsiTreeUtil {
*/
@SafeVarargs
public static @NotNull <T extends PsiElement> Collection<T> findChildrenOfAnyType(@Nullable PsiElement element,
boolean strict,
Class<? extends T> @NotNull ... classes) {
boolean strict,
@NotNull Class<? extends T> @NotNull ... classes) {
if (element == null) {
return Collections.emptyList();
}
@@ -404,7 +404,7 @@ public class PsiTreeUtil {
}
@SafeVarargs
public static @NotNull <T extends PsiElement> List<T> getChildrenOfAnyType(@Nullable PsiElement element, Class<? extends T> @NotNull ... classes) {
public static @NotNull <T extends PsiElement> List<T> getChildrenOfAnyType(@Nullable PsiElement element, @NotNull Class<? extends T> @NotNull ... classes) {
if (element == null) return ContainerUtil.emptyList();
List<T> result = null;
@@ -476,8 +476,8 @@ public class PsiTreeUtil {
return result;
}
public static boolean instanceOf(Object object, Class<?>... classes) {
if (object != null && classes != null) {
public static boolean instanceOf(Object object, @NotNull Class<?> @NotNull ... classes) {
if (object != null) {
for (Class<?> c : classes) {
if (c.isInstance(object)) return true;
}
@@ -575,7 +575,7 @@ public class PsiTreeUtil {
public static @Nullable <T extends PsiElement> T getContextOfType(@Nullable PsiElement element,
@NotNull Class<T> aClass,
boolean strict,
Class<? extends PsiElement>... stopAt) {
@NotNull Class<? extends PsiElement> @NotNull ... stopAt) {
if (element == null) return null;
if (strict) {
element = element.getContext();
@@ -605,7 +605,7 @@ public class PsiTreeUtil {
@Contract("null, _, _ -> null")
public static @Nullable <T extends PsiElement> T getContextOfType(@Nullable PsiElement element,
boolean strict,
Class<? extends T> @NotNull ... classes) {
@NotNull Class<? extends T> @NotNull ... classes) {
if (element == null) return null;
if (strict) {
element = element.getContext();
@@ -655,7 +655,7 @@ public class PsiTreeUtil {
public static @Nullable <T extends PsiElement> T getParentOfType(@Nullable PsiElement element,
@NotNull Class<T> aClass,
boolean strict,
Class<? extends PsiElement> @NotNull ... stopAt) {
@NotNull Class<? extends PsiElement> @NotNull ... stopAt) {
if (element == null) return null;
if (strict) {
if (element instanceof PsiFile) return null;
@@ -734,7 +734,7 @@ public class PsiTreeUtil {
*/
@SafeVarargs
@Contract("null, _ -> null")
public static @Nullable PsiElement skipSiblingsForward(@Nullable PsiElement element, Class<? extends PsiElement> @NotNull ... elementClasses) {
public static @Nullable PsiElement skipSiblingsForward(@Nullable PsiElement element, @NotNull Class<? extends PsiElement> @NotNull ... elementClasses) {
if (element == null) return null;
for (PsiElement e = element.getNextSibling(); e != null; e = e.getNextSibling()) {
if (!instanceOf(e, elementClasses)) {
@@ -772,7 +772,7 @@ public class PsiTreeUtil {
*/
@SafeVarargs
@Contract("null, _ -> null")
public static @Nullable PsiElement skipSiblingsBackward(@Nullable PsiElement element, Class<? extends PsiElement> @NotNull ... elementClasses) {
public static @Nullable PsiElement skipSiblingsBackward(@Nullable PsiElement element, @NotNull Class<? extends PsiElement> @NotNull ... elementClasses) {
if (element == null) return null;
for (PsiElement e = element.getPrevSibling(); e != null; e = e.getPrevSibling()) {
if (!instanceOf(e, elementClasses)) {
@@ -811,7 +811,7 @@ public class PsiTreeUtil {
*/
@SafeVarargs
@Contract("null, _ -> null")
public static @Nullable PsiElement skipParentsOfType(@Nullable PsiElement element, Class<? extends PsiElement> @NotNull ... parentClasses) {
public static @Nullable PsiElement skipParentsOfType(@Nullable PsiElement element, @NotNull Class<? extends PsiElement> @NotNull ... parentClasses) {
if (element == null) return null;
for (PsiElement e = element.getParent(); e != null; e = e.getParent()) {
if (!instanceOf(e, parentClasses)) {
@@ -864,7 +864,7 @@ public class PsiTreeUtil {
@SafeVarargs
@Contract("null, _ -> null")
public static @Nullable <T extends PsiElement> T getNonStrictParentOfType(@Nullable PsiElement element,
Class<? extends T> @NotNull ... classes) {
@NotNull Class<? extends T> @NotNull ... classes) {
PsiElement run = element;
while (run != null) {
if (instanceOf(run, classes)) {

2
plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java
View File

@@ -211,7 +211,7 @@ public class ReuseOfLocalVariableInspection extends BaseInspection {
}
private static <T extends PsiElement> boolean hasParentOfTypeBeforeAncestor(@NotNull PsiElement descendant, @NotNull PsiElement ancestor,
final Class<? extends T> @NotNull ... classes) {
@NotNull Class<? extends T> @NotNull ... classes) {
PsiElement elementToTest = descendant.getParent();
while (elementToTest != null) {
if (elementToTest.equals(ancestor)) return false;

7
python/python-psi-impl/src/com/jetbrains/python/psi/PyUtil.java
View File

@@ -51,6 +51,7 @@ import com.jetbrains.python.pyi.PyiStubSuppressor;
import one.util.streamex.StreamEx;
import org.jetbrains.annotations.*;
import javax.swing.*;
import java.io.File;
import java.util.*;
@@ -681,7 +682,7 @@ public final class PyUtil {
* from the write action, because in this case {@code function} will be executed right in the current thread (presumably EDT)
* without any progress whatsoever to avoid possible deadlock.
*
* @see ApplicationImpl#runProcessWithProgressSynchronously(Runnable, String, boolean, Project, JComponent, String)
* @see com.intellij.openapi.application.impl.ApplicationImpl#runProcessWithProgressSynchronously(Runnable, String, boolean, boolean, Project, JComponent, String)
*/
public static void runWithProgress(@Nullable Project project, @Nls(capitalization = Nls.Capitalization.Title) @NotNull String title,
boolean modal, boolean canBeCancelled, @NotNull final Consumer<? super ProgressIndicator> function) {
@@ -1307,7 +1308,7 @@ public final class PyUtil {
}
@Nullable
public static PsiElement findPrevAtOffset(PsiFile psiFile, int caretOffset, Class... toSkip) {
public static PsiElement findPrevAtOffset(PsiFile psiFile, int caretOffset, @NotNull Class<? extends PsiElement> @NotNull ... toSkip) {
PsiElement element;
if (caretOffset < 0) {
return null;
@@ -1345,7 +1346,7 @@ public final class PyUtil {
}
@Nullable
public static PsiElement findNextAtOffset(@NotNull final PsiFile psiFile, int caretOffset, Class... toSkip) {
public static PsiElement findNextAtOffset(@NotNull final PsiFile psiFile, int caretOffset, @NotNull Class<? extends PsiElement> @NotNull ... toSkip) {
PsiElement element = psiFile.findElementAt(caretOffset);
if (element == null) {
return null;