From 9dc5354f245b1de5cdc2f33887ee225000615c50 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 16 Aug 2017 12:52:35 +0300 Subject: [PATCH] Eliminate some warnings (mostly redundant is checks in whens) --- .../frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt | 3 +-- .../backend/common/lower/DefaultArgumentStubGenerator.kt | 3 +-- .../kotlin/idea/inspections/AddVarianceModifierInspection.kt | 3 +-- .../createVariable/CreateParameterByRefActionFactory.kt | 4 +--- .../kotlin/idea/refactoring/kotlinRefactoringUtil.kt | 2 +- .../jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt index e4e95798d11..3a7b9c2e852 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/codeFragmentUtil.kt @@ -38,8 +38,7 @@ fun KtElement.suppressDiagnosticsInDebugMode(): Boolean { var KtFile.suppressDiagnosticsInDebugMode: Boolean get() = when (this) { is KtCodeFragment -> true - is KtFile -> getUserData(SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE) ?: false - else -> false + else -> getUserData(SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE) ?: false } set(skip) { putUserData(SUPPRESS_DIAGNOSTICS_IN_DEBUG_MODE, skip) diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt index c8a8f370de4..142ee8f3f1c 100644 --- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt +++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/DefaultArgumentStubGenerator.kt @@ -350,7 +350,7 @@ private fun FunctionDescriptor.generateDefaultsFunction(context: CommonBackendCo /* annotations = */ annotations, /* isPrimary = */ false, /* source = */ source) - is FunctionDescriptor -> { + else -> { val name = Name.identifier("$name\$default") SimpleFunctionDescriptorImpl.create( @@ -360,7 +360,6 @@ private fun FunctionDescriptor.generateDefaultsFunction(context: CommonBackendCo /* kind = */ CallableMemberDescriptor.Kind.SYNTHESIZED, /* source = */ source) } - else -> TODO("FIXME: $this") } val syntheticParameters = MutableList(valueParameters.size / 32 + 1) { i -> diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt index b6bd262b513..c0a365331cf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/AddVarianceModifierInspection.kt @@ -44,8 +44,7 @@ class AddVarianceModifierInspection : AbstractKotlinInspection() { for (member in klass.declarations + klass.primaryConstructorParameters) { val descriptor = when (member) { is KtParameter -> context.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, member) - is KtDeclaration -> context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, member) - else -> null + else -> context.get(BindingContext.DECLARATION_TO_DESCRIPTOR, member) } as? MemberDescriptor ?: continue when (member) { is KtClassOrObject -> { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt index 59035e9047c..3d2cc0999a6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateParameterByRefActionFactory.kt @@ -136,12 +136,10 @@ fun KotlinType.hasTypeParametersToAdd(functionDescriptor: FunctionDescriptor, co (functionDescriptor.containingDeclaration as? ClassDescriptorWithResolutionScopes)?.scopeForClassHeaderResolution } - is FunctionDescriptor -> { + else -> { val function = functionDescriptor.source.getPsi() as? KtFunction function?.bodyExpression?.getResolutionScope(context, function.getResolutionFacade()) } - - else -> null } ?: return true return typeParametersToAdd.any { scope.findClassifier(it.name, NoLookupLocation.FROM_IDE) != it } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index 2478ee5f46e..a9fe3fd895a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -968,7 +968,7 @@ fun KtNamedDeclaration.isCompanionMemberOf(klass: KtClassOrObject): Boolean { internal fun KtDeclaration.withHeaderImplementations(): List { val header = liftToHeader() ?: return listOf(this) - val implementations = header.headerImplementations() ?: emptySet() + val implementations = header.headerImplementations() return listOf(header) + implementations } diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt index 80c5e7c29f5..b49bad20a36 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/jsRenderers.kt @@ -35,8 +35,7 @@ abstract class JsCallDataRenderer : DiagnosticParameterRenderer { override fun render(data: JsCallData, context: RenderingContext): String = when (data) { is JsCallDataWithCode -> format(data) - is JsCallData -> data.message - else -> throw AssertionError("Cannot render null data") + else -> data.message } }