From 3944d56ac2b509ae731c6a285ee636d04950202c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 16 Mar 2016 11:24:50 +0300 Subject: [PATCH] Minor, remove unnecessary type parameter in CallChecker#check --- .../load/kotlin/JavaAnnotationCallChecker.kt | 17 ++--------------- .../jvm/checkers/JavaClassOnCompanionChecker.kt | 3 +-- ...ProtectedInSuperClassCompanionCallChecker.kt | 6 ++---- .../jvm/checkers/ReflectionAPICallChecker.kt | 3 +-- .../SuperCallWithDefaultArgumentsChecker.kt | 5 ++--- .../checkers/TraitDefaultMethodCallChecker.kt | 5 ++--- ...upportedSyntheticCallableReferenceChecker.kt | 3 +-- .../resolve/ConstructorHeaderCallChecker.kt | 3 +-- .../resolve/calls/checkers/CallChecker.kt | 3 +-- .../CallReturnsArrayOfNothingChecker.kt | 3 +-- .../calls/checkers/CapturingInClosureChecker.kt | 4 +--- .../resolve/calls/checkers/InlineChecker.java | 2 +- .../calls/checkers/InlineCheckerWrapper.kt | 5 ++--- .../calls/checkers/InvokeConventionChecker.kt | 3 +-- ...ReifiedTypeParameterSubstitutionChecker.java | 9 +++++---- .../resolve/calls/checkers/SafeCallChecker.kt | 5 ++--- .../js/resolve/diagnostics/JsCallChecker.kt | 3 +-- ...=> AndroidExtensionPropertiesCallChecker.kt} | 17 ++++++++--------- 18 files changed, 35 insertions(+), 64 deletions(-) rename plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/{AndroidExtensionPropertiesCallChecked.kt => AndroidExtensionPropertiesCallChecker.kt} (93%) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt index 9472d1bb5cf..cfb089c103d 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaAnnotationCallChecker.kt @@ -16,33 +16,23 @@ package org.jetbrains.kotlin.load.kotlin -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticFactory0 -import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.java.components.JavaAnnotationMapper import org.jetbrains.kotlin.load.java.descriptors.JavaConstructorDescriptor -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.psi.KtAnnotationEntry import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext -import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm -import org.jetbrains.kotlin.types.KotlinType -import org.jetbrains.kotlin.types.TypeUtils -import java.lang.annotation.Target class JavaAnnotationCallChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val resultingDescriptor = resolvedCall.resultingDescriptor.original if (resultingDescriptor !is JavaConstructorDescriptor || resultingDescriptor.containingDeclaration.kind != ClassKind.ANNOTATION_CLASS) return @@ -59,10 +49,7 @@ class JavaAnnotationCallChecker : CallChecker { } } - private fun reportErrorsOnPositionedArguments( - resolvedCall: ResolvedCall<*>, - context: BasicCallResolutionContext - ) { + private fun reportErrorsOnPositionedArguments(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { getJavaAnnotationCallValueArgumentsThatShouldBeNamed(resolvedCall).forEach { reportOnValueArgument(context, it, ErrorsJvm.POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION) } diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaClassOnCompanionChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaClassOnCompanionChecker.kt index 4ac7620b20d..2694d4f4e63 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaClassOnCompanionChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaClassOnCompanionChecker.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor @@ -29,7 +28,7 @@ import org.jetbrains.kotlin.types.KotlinTypeImpl import org.jetbrains.kotlin.types.TypeProjectionImpl class JavaClassOnCompanionChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val descriptor = resolvedCall.resultingDescriptor if (descriptor !is PropertyDescriptor || descriptor.name.asString() != "javaClass") return diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt index 6c15bdf0575..3619aad0000 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ProtectedInSuperClassCompanionCallChecker.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -28,8 +27,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.parentsWithSelf import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm class ProtectedInSuperClassCompanionCallChecker : CallChecker { - - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val targetDescriptor = resolvedCall.resultingDescriptor.original // Protected non-JVM static if (targetDescriptor.visibility != Visibilities.PROTECTED) return @@ -48,4 +46,4 @@ class ProtectedInSuperClassCompanionCallChecker : CallChecker { } } } -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ReflectionAPICallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ReflectionAPICallChecker.kt index c2ac35bc467..b39483a4644 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ReflectionAPICallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ReflectionAPICallChecker.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers import org.jetbrains.kotlin.builtins.ReflectionTypes -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.load.java.JvmAbi @@ -45,7 +44,7 @@ class ReflectionAPICallChecker(private val module: ModuleDescriptor, storageMana setOf(reflectionTypes.kProperty0, reflectionTypes.kProperty1, reflectionTypes.kProperty2) } - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { if (isReflectionAvailable) return val descriptor = resolvedCall.resultingDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/SuperCallWithDefaultArgumentsChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/SuperCallWithDefaultArgumentsChecker.kt index e807a3bc919..51322eee4b5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/SuperCallWithDefaultArgumentsChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/SuperCallWithDefaultArgumentsChecker.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.resolve.calls.callResolverUtil.getSuperCallExpression import org.jetbrains.kotlin.resolve.calls.callUtil.usesDefaultArguments import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker @@ -25,9 +24,9 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm class SuperCallWithDefaultArgumentsChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val superCallExpression = getSuperCallExpression(resolvedCall.call) if (superCallExpression == null || !resolvedCall.usesDefaultArguments()) return context.trace.report(ErrorsJvm.SUPER_CALL_WITH_DEFAULT_PARAMETERS.on(superCallExpression.parent, resolvedCall.resultingDescriptor.name.asString())) } -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt index 7234845635b..d3b719fed28 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/TraitDefaultMethodCallChecker.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.psi.KtExpression @@ -30,8 +29,8 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm class TraitDefaultMethodCallChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { - if (getSuperCallExpression(resolvedCall.getCall()) == null) return + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { + if (getSuperCallExpression(resolvedCall.call) == null) return val targetDescriptor = resolvedCall.resultingDescriptor.original val containerDescriptor = targetDescriptor.containingDeclaration diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/UnsupportedSyntheticCallableReferenceChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/UnsupportedSyntheticCallableReferenceChecker.kt index eab11eb33ff..461be4963eb 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/UnsupportedSyntheticCallableReferenceChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/UnsupportedSyntheticCallableReferenceChecker.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.jvm.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.diagnostics.Errors.UNSUPPORTED import org.jetbrains.kotlin.psi.KtCallableReferenceExpression import org.jetbrains.kotlin.psi.KtNameReferenceExpression @@ -26,7 +25,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor class UnsupportedSyntheticCallableReferenceChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val expression = context.call.callElement if (expression !is KtNameReferenceExpression || expression.parent !is KtCallableReferenceExpression) return diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ConstructorHeaderCallChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ConstructorHeaderCallChecker.kt index 19a32fe9b1d..5782a0bb4d9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ConstructorHeaderCallChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ConstructorHeaderCallChecker.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.diagnostics.Errors @@ -31,7 +30,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.Receiver import org.jetbrains.kotlin.resolve.scopes.utils.parentsWithSelf object ConstructorHeaderCallChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val dispatchReceiverClass = resolvedCall.dispatchReceiver.classDescriptorForImplicitReceiver val extensionReceiverClass = resolvedCall.extensionReceiver.classDescriptorForImplicitReceiver diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallChecker.kt index 051e519d964..1e6803765b9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallChecker.kt @@ -16,10 +16,9 @@ package org.jetbrains.kotlin.resolve.calls.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall interface CallChecker { - fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) + fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallReturnsArrayOfNothingChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallReturnsArrayOfNothingChecker.kt index b49ddb37e26..e6d7fe934ab 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallReturnsArrayOfNothingChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CallReturnsArrayOfNothingChecker.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.calls.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall @@ -25,7 +24,7 @@ import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.typeUtil.isArrayOfNothing class CallReturnsArrayOfNothingChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val returnType = resolvedCall.resultingDescriptor.returnType if (returnType.containsArrayOfNothing()) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CapturingInClosureChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CapturingInClosureChecker.kt index 3ab1aac4bb8..670898bcc0e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CapturingInClosureChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/CapturingInClosureChecker.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.types.expressions.CaptureKind class CapturingInClosureChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val variableResolvedCall = if (resolvedCall is VariableAsFunctionResolvedCall) resolvedCall.variableCall else resolvedCall val variableDescriptor = variableResolvedCall.resultingDescriptor as? VariableDescriptor if (variableDescriptor != null) { @@ -75,5 +75,3 @@ class CapturingInClosureChecker : CallChecker { return false } } - - diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java index 3501789559b..f317c47a3e3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java @@ -67,7 +67,7 @@ class InlineChecker implements CallChecker { } @Override - public void check(@NotNull ResolvedCall resolvedCall, @NotNull BasicCallResolutionContext context) { + public void check(@NotNull ResolvedCall resolvedCall, @NotNull BasicCallResolutionContext context) { KtExpression expression = context.call.getCalleeExpression(); if (expression == null) { return; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineCheckerWrapper.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineCheckerWrapper.kt index 5cc36f6f1e9..e3435c1ce94 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineCheckerWrapper.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineCheckerWrapper.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.calls.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext @@ -27,7 +26,7 @@ import java.lang.ref.WeakReference class InlineCheckerWrapper : CallChecker { private var checkersCache: WeakReference>? = null - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { if (context.isAnnotationContext) return var parentDescriptor: DeclarationDescriptor? = context.scope.ownerDescriptor @@ -47,4 +46,4 @@ class InlineCheckerWrapper : CallChecker { checkersCache = checkersCache ?: WeakReference(map) return map.getOrPut(descriptor) { InlineChecker(descriptor) } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InvokeConventionChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InvokeConventionChecker.kt index 09b2c6524b4..2eb0e9de74e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InvokeConventionChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InvokeConventionChecker.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.calls.checkers import org.jetbrains.kotlin.builtins.isExtensionFunctionType -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall @@ -25,7 +24,7 @@ import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCallIm import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver class InvokeConventionChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { if (resolvedCall is VariableAsFunctionResolvedCallImpl) { val functionCall = resolvedCall.functionCall val variableCall = resolvedCall.variableCall diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java index a307ac0a28a..097bf7b0484 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java @@ -19,7 +19,10 @@ package org.jetbrains.kotlin.resolve.calls.checkers; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.KtExpression; @@ -32,9 +35,7 @@ import java.util.Map; public class ReifiedTypeParameterSubstitutionChecker implements CallChecker { @Override - public void check( - @NotNull ResolvedCall resolvedCall, @NotNull BasicCallResolutionContext context - ) { + public void check(@NotNull ResolvedCall resolvedCall, @NotNull BasicCallResolutionContext context) { Map typeArguments = resolvedCall.getTypeArguments(); for (Map.Entry entry : typeArguments.entrySet()) { TypeParameterDescriptor parameter = entry.getKey(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/SafeCallChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/SafeCallChecker.kt index fc6d8c17aa2..aba15035138 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/SafeCallChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/SafeCallChecker.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.resolve.calls.checkers -import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext @@ -24,11 +23,11 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind class SafeCallChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val operationNode = resolvedCall.call.callOperationNode ?: return if (operationNode.elementType == KtTokens.SAFE_ACCESS && resolvedCall.explicitReceiverKind == ExplicitReceiverKind.NO_EXPLICIT_RECEIVER) { context.trace.report(Errors.UNEXPECTED_SAFE_CALL.on(operationNode.psi)) } } -} \ No newline at end of file +} diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt index 581928a20e5..b287f5d4cc8 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsCallChecker.kt @@ -24,7 +24,6 @@ import com.google.gwt.dev.js.rhino.CodePosition import com.google.gwt.dev.js.rhino.ErrorReporter import com.google.gwt.dev.js.rhino.Utils.isEndOfLine import com.intellij.openapi.util.TextRange -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1 @@ -63,7 +62,7 @@ class JsCallChecker( } } - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { if (context.isAnnotationContext || !resolvedCall.isJsCall()) return val expression = resolvedCall.call.callElement diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecked.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecker.kt similarity index 93% rename from plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecked.kt rename to plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecker.kt index 7e75c88a521..38d5bae8dcf 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecked.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/AndroidExtensionPropertiesCallChecker.kt @@ -16,18 +16,18 @@ package org.jetbrains.kotlin.android.synthetic.diagnostic -import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.android.synthetic.descriptors.AndroidSyntheticPackageFragmentDescriptor +import org.jetbrains.kotlin.android.synthetic.diagnostic.ErrorsAndroid.* +import org.jetbrains.kotlin.android.synthetic.res.AndroidSyntheticProperty +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.diagnostics.DiagnosticSink +import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall -import org.jetbrains.kotlin.android.synthetic.diagnostic.ErrorsAndroid.* -import org.jetbrains.kotlin.android.synthetic.descriptors.AndroidSyntheticPackageFragmentDescriptor -import org.jetbrains.kotlin.android.synthetic.res.AndroidSyntheticProperty -import org.jetbrains.kotlin.diagnostics.DiagnosticSink -import org.jetbrains.kotlin.psi.KtExpression class AndroidExtensionPropertiesCallChecker : CallChecker { - override fun check(resolvedCall: ResolvedCall, context: BasicCallResolutionContext) { + override fun check(resolvedCall: ResolvedCall<*>, context: BasicCallResolutionContext) { val expression = context.call.calleeExpression ?: return val propertyDescriptor = resolvedCall.resultingDescriptor as? PropertyDescriptor ?: return @@ -53,5 +53,4 @@ class AndroidExtensionPropertiesCallChecker : CallChecker { val warning = if (type.contains('.')) SYNTHETIC_UNRESOLVED_WIDGET_TYPE else SYNTHETIC_INVALID_WIDGET_TYPE report(warning.on(expression, type)) } - -} \ No newline at end of file +}