Code cleanup

This commit is contained in:
Alexey Tsvetkov
2015-10-19 19:14:40 +03:00
parent 6f96484e1f
commit e9e42b0251
10 changed files with 17 additions and 51 deletions
@@ -48,11 +48,6 @@ public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDe
descriptor.getReturnType(),
Modality.FINAL,
Visibilities.LOCAL);
setOperator(descriptor.isOperator());
setInfix(descriptor.isInfix());
setExternal(descriptor.isExternal());
setInline(descriptor.isInline());
setTailrec(descriptor.isTailrec());
}
@NotNull
@@ -33,7 +33,6 @@ private val NATIVE_ANNOTATION_CLASS_NAME = FqName("kotlin.jvm.native")
public fun DeclarationDescriptor.hasNativeAnnotation(): Boolean {
return this is FunctionDescriptor && this.isExternal
|| this is PropertyAccessorDescriptor && this.isExternal
|| annotations.findAnnotation(NATIVE_ANNOTATION_CLASS_NAME) != null
}
@@ -114,8 +114,7 @@ public class AnnotationResolver {
return Annotations.Companion.getEMPTY();
}
List<JetAnnotationEntry> annotationEntryElements = modifierList.getAnnotationEntries();
return resolveAnnotationEntries(scope, annotationEntryElements, trace, shouldResolveArguments);
return resolveAnnotationEntries(scope, modifierList.getAnnotationEntries(), trace, shouldResolveArguments);
}
private Annotations resolveAnnotationEntries(
@@ -33,13 +33,8 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall;
public class InlineUtil {
public static boolean isInlineLambdaParameter(@NotNull ParameterDescriptor valueParameterOrReceiver) {
boolean isNoinlineParameter = false;
if (valueParameterOrReceiver instanceof ValueParameterDescriptor) {
isNoinlineParameter = ((ValueParameterDescriptor) valueParameterOrReceiver).isNoinline();
}
return !isNoinlineParameter &&
return !(valueParameterOrReceiver instanceof ValueParameterDescriptor
&& ((ValueParameterDescriptor) valueParameterOrReceiver).isNoinline()) &&
KotlinBuiltIns.isExactFunctionOrExtensionFunctionType(valueParameterOrReceiver.getOriginal().getType());
}