azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove SuppressWarning('NullableProblems') and change @NotNull annotation to @Nullable in DescriptorPredicate.apply method

Browse Source
This commit is contained in:
Michael Nedzelsky
2014-09-07 15:21:07 +04:00
parent cc4f84ffae
commit 36ada06bdb
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java
+2 -1
View File
@@ -53,7 +53,8 @@ public enum PrimitiveUnaryOperationFIF implements FunctionIntrinsicFactory {
@NotNull @NotNull
private static final DescriptorPredicate NO_PARAMETERS = new DescriptorPredicate() { private static final DescriptorPredicate NO_PARAMETERS = new DescriptorPredicate() {
@Override @Override
public boolean apply(@NotNull FunctionDescriptor descriptor) { public boolean apply(@Nullable FunctionDescriptor descriptor) {
assert descriptor != null : "argument for DescriptorPredicate.apply should not be null";
return !JsDescriptorUtils.hasParameters(descriptor); return !JsDescriptorUtils.hasParameters(descriptor);
} }
}; };
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/DescriptorPredicate.java
+2 -2
View File
@@ -17,10 +17,10 @@
package org.jetbrains.k2js.translate.intrinsic.functions.patterns; package org.jetbrains.k2js.translate.intrinsic.functions.patterns;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
public interface DescriptorPredicate extends Predicate<FunctionDescriptor> { public interface DescriptorPredicate extends Predicate<FunctionDescriptor> {
@Override @Override
boolean apply(@SuppressWarnings("NullableProblems") @NotNull FunctionDescriptor descriptor); boolean apply(@Nullable FunctionDescriptor descriptor);
} }
js/js.translator/src/org/jetbrains/k2js/translate/intrinsic/functions/patterns/PatternBuilder.java
+6 -2
View File
@@ -18,6 +18,7 @@ package org.jetbrains.k2js.translate.intrinsic.functions.patterns;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.OverrideResolver;
@@ -84,7 +85,8 @@ public final class PatternBuilder {
return new DescriptorPredicate() { return new DescriptorPredicate() {
@Override @Override
public boolean apply(@NotNull FunctionDescriptor descriptor) { public boolean apply(@Nullable FunctionDescriptor descriptor) {
assert descriptor != null : "argument for DescriptorPredicate.apply should not be null, checkers=" + checkersWithPrefixChecker;
//TODO: no need to wrap if we check beforehand //TODO: no need to wrap if we check beforehand
try { try {
return doApply(descriptor); return doApply(descriptor);
@@ -167,7 +169,9 @@ public final class PatternBuilder {
} }
@Override @Override
public boolean apply(@NotNull FunctionDescriptor functionDescriptor) { public boolean apply(@Nullable FunctionDescriptor functionDescriptor) {
assert functionDescriptor != null :
"argument for DescriptorPredicate.apply should not be null, receiverFqName=" + receiverFqName + " names=" + Arrays.asList(names);
ReceiverParameterDescriptor actualReceiver = functionDescriptor.getReceiverParameter(); ReceiverParameterDescriptor actualReceiver = functionDescriptor.getReceiverParameter();
if (actualReceiver != null) { if (actualReceiver != null) {
if (receiverFqName == null) return false; if (receiverFqName == null) return false;