From 1a7d393bbfe7dc6f2a24d211d10bfe6ec41b1c64 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 21 Mar 2019 15:01:15 +0300 Subject: [PATCH] cleanup --- .../src/com/intellij/psi/PsiClassType.java | 2 ++ .../psi/util/PsiExpressionTrimRenderer.java | 10 +++--- .../src/com/intellij/psi/util/PsiUtil.java | 35 +++++++++++-------- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java index b144901b000a..96e2ad627921 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiClassType.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiClassType.java @@ -90,6 +90,7 @@ public abstract class PsiClassType extends PsiType implements JvmReferenceType { return getParameters().length; } + @Override public boolean equals(Object obj) { if (this == obj) return true; if (!(obj instanceof PsiClassType)) { @@ -166,6 +167,7 @@ public abstract class PsiClassType extends PsiType implements JvmReferenceType { return false; } + @Override public int hashCode() { final String className = getClassName(); if (className == null) return 0; diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java b/java/java-psi-api/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java index 23ff2c2cc7cf..4992cd33aba0 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiExpressionTrimRenderer.java @@ -17,7 +17,8 @@ package com.intellij.psi.util; import com.intellij.psi.*; -import com.intellij.util.Function; +import com.intellij.util.NotNullFunction; +import org.jetbrains.annotations.NotNull; public class PsiExpressionTrimRenderer extends JavaRecursiveElementWalkingVisitor { private final StringBuilder myBuf; @@ -247,18 +248,19 @@ public class PsiExpressionTrimRenderer extends JavaRecursiveElementWalkingVisito } } - public static class RenderFunction implements Function { + public static class RenderFunction implements NotNullFunction { + @NotNull @Override public String fun(PsiExpression psiExpression) { return render(psiExpression); } } - public static String render(PsiExpression expression) { + public static String render(@NotNull PsiExpression expression) { return render(expression, 100); } - public static String render(PsiExpression expression, int maxLength) { + public static String render(@NotNull PsiExpression expression, int maxLength) { StringBuilder buf = new StringBuilder(); expression.accept(new PsiExpressionTrimRenderer(buf)); final String text = buf.toString(); diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java index f26268b6182e..30de642d118a 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java @@ -169,7 +169,9 @@ public final class PsiUtil extends PsiUtilCore { private static void addException(@NotNull PsiMethod method, @Nullable PsiClass exceptionClass, @Nullable String exceptionName) throws IncorrectOperationException { - assert exceptionClass != null || exceptionName != null : "One of exceptionName, exceptionClass must be not null"; + if (exceptionClass == null && exceptionName == null) { + throw new IllegalArgumentException("One of exceptionName, exceptionClass must be not null"); + } PsiReferenceList throwsList = method.getThrowsList(); PsiJavaCodeReferenceElement[] refs = throwsList.getReferenceElements(); boolean replaced = false; @@ -371,8 +373,8 @@ public final class PsiUtil extends PsiUtilCore { return Collections.emptyList(); } - private static void collectSwitchResultExpressions(List result, PsiElement container) { - ArrayList breaks = new ArrayList<>(); + private static void collectSwitchResultExpressions(@NotNull List result, @NotNull PsiElement container) { + List breaks = new ArrayList<>(); addStatements(breaks, container, PsiBreakStatement.class, element -> element instanceof PsiSwitchBlock); for (PsiBreakStatement aBreak : breaks) { ContainerUtil.addIfNotNull(result, aBreak.getExpression()); @@ -402,7 +404,9 @@ public final class PsiUtil extends PsiUtilCore { @PsiModifier.ModifierConstant @NotNull public static String getAccessModifier(@AccessLevel int accessLevel) { - assert accessLevel > 0 && accessLevel <= accessModifiers.length : accessLevel; + if (accessLevel <= 0 || accessLevel > accessModifiers.length) { + throw new IllegalArgumentException("Unknown level:" + accessLevel); + } @SuppressWarnings("UnnecessaryLocalVariable") @PsiModifier.ModifierConstant final String modifier = accessModifiers[accessLevel - 1]; return modifier; @@ -561,12 +565,12 @@ public final class PsiUtil extends PsiUtilCore { } @MethodCandidateInfo.ApplicabilityLevelConstant - public static int getApplicabilityLevel(@NotNull final PsiMethod method, - @NotNull final PsiSubstitutor substitutorForMethod, - @NotNull final PsiType[] args, - @NotNull final LanguageLevel languageLevel, - final boolean allowUncheckedConversion, - final boolean checkVarargs) { + private static int getApplicabilityLevel(@NotNull final PsiMethod method, + @NotNull final PsiSubstitutor substitutorForMethod, + @NotNull final PsiType[] args, + @NotNull final LanguageLevel languageLevel, + final boolean allowUncheckedConversion, + final boolean checkVarargs) { return getApplicabilityLevel(method, substitutorForMethod, args, languageLevel, allowUncheckedConversion, checkVarargs, ApplicabilityChecker.ASSIGNABILITY_CHECKER); } @@ -667,9 +671,9 @@ public final class PsiUtil extends PsiUtilCore { * {@code class Foo{}} types Foo<?> and Foo<? extends Number> * would be equivalent */ - public static boolean equalOnEquivalentClasses(PsiClassType thisClassType, + public static boolean equalOnEquivalentClasses(@NotNull PsiClassType thisClassType, @NotNull PsiClass aClass, - PsiClassType otherClassType, + @NotNull PsiClassType otherClassType, @NotNull PsiClass bClass) { final PsiClassType capture1 = !PsiCapturedWildcardType.isCapture() ? thisClassType : (PsiClassType)captureToplevelWildcards(thisClassType, aClass); @@ -1336,14 +1340,17 @@ public final class PsiUtil extends PsiUtilCore { @NotNull public static PsiReturnStatement[] findReturnStatements(@Nullable PsiCodeBlock body) { - ArrayList vector = new ArrayList<>(); + List vector = new ArrayList<>(); if (body != null) { addStatements(vector, body, PsiReturnStatement.class, statement -> false); } return vector.toArray(PsiReturnStatement.EMPTY_ARRAY); } - private static void addStatements(List vector, PsiElement element, Class clazz, Predicate stopAt) { + private static void addStatements(@NotNull List vector, + @NotNull PsiElement element, + @NotNull Class clazz, + @NotNull Predicate stopAt) { if (PsiTreeUtil.instanceOf(element, clazz)) { //noinspection unchecked vector.add((T)element);