From 7b67c47594c5dc4103c7c31e07346c6c75c27e9a Mon Sep 17 00:00:00 2001 From: develar Date: Tue, 6 Aug 2013 17:24:48 +0400 Subject: [PATCH] JS backend: descriptor parameter of DescriptorPredicate#apply marked as @NotNull. --- .../intrinsic/functions/factories/CompositeFIF.java | 7 +++---- .../functions/factories/PrimitiveUnaryOperationFIF.java | 5 ++--- .../intrinsic/functions/patterns/DescriptorPredicate.java | 4 ++-- .../intrinsic/functions/patterns/PatternBuilder.java | 8 +++----- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/CompositeFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/CompositeFIF.java index 72c7ff7bc62..e9f5d5f36c9 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/CompositeFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/CompositeFIF.java @@ -16,7 +16,6 @@ package org.jetbrains.k2js.translate.intrinsic.functions.factories; -import com.google.common.base.Predicate; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,11 +35,11 @@ public abstract class CompositeFIF implements FunctionIntrinsicFactory { @NotNull @Override - public Predicate getPredicate() { + public DescriptorPredicate getPredicate() { return new DescriptorPredicate() { @Override - public boolean apply(@Nullable FunctionDescriptor descriptor) { - return descriptor != null && findIntrinsic(descriptor) != null; + public boolean apply(@NotNull FunctionDescriptor descriptor) { + return findIntrinsic(descriptor) != null; } }; } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java index 15de3d52f58..c910097ebcb 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java @@ -53,8 +53,7 @@ public enum PrimitiveUnaryOperationFIF implements FunctionIntrinsicFactory { @NotNull private static final DescriptorPredicate NO_PARAMETERS = new DescriptorPredicate() { @Override - public boolean apply(@Nullable FunctionDescriptor descriptor) { - assert descriptor != null; + public boolean apply(@NotNull FunctionDescriptor descriptor) { return !JsDescriptorUtils.hasParameters(descriptor); } }; @@ -72,7 +71,7 @@ public enum PrimitiveUnaryOperationFIF implements FunctionIntrinsicFactory { public FunctionIntrinsic getIntrinsic(@NotNull FunctionDescriptor descriptor) { Name name = descriptor.getName(); - JsUnaryOperator jsOperator = null; + JsUnaryOperator jsOperator; if ("inv".equals(name.asString())) { jsOperator = JsUnaryOperator.BIT_NOT; } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java index ab5024655c7..3e275a330d5 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java @@ -17,10 +17,10 @@ package org.jetbrains.k2js.translate.intrinsic.functions.patterns; import com.google.common.base.Predicate; -import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; public interface DescriptorPredicate extends Predicate { @Override - boolean apply(@Nullable FunctionDescriptor descriptor); + boolean apply(@SuppressWarnings("NullableProblems") @NotNull FunctionDescriptor descriptor); } diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java index 44a4ea4432d..7f24808aea4 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java @@ -18,7 +18,6 @@ package org.jetbrains.k2js.translate.intrinsic.functions.patterns; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; @@ -85,8 +84,7 @@ public final class PatternBuilder { return new DescriptorPredicate() { @Override - public boolean apply(@Nullable FunctionDescriptor descriptor) { - assert descriptor != null; + public boolean apply(@NotNull FunctionDescriptor descriptor) { //TODO: no need to wrap if we check beforehand try { return doApply(descriptor); @@ -146,8 +144,8 @@ public final class PatternBuilder { } @Override - public boolean apply(@Nullable FunctionDescriptor functionDescriptor) { - if (functionDescriptor == null || (functionDescriptor.getReceiverParameter() == null) == receiverParameterExists) { + public boolean apply(@NotNull FunctionDescriptor functionDescriptor) { + if ((functionDescriptor.getReceiverParameter() == null) == receiverParameterExists) { return false; }