diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt index 031e097e3cd..dbbc4fb8d38 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/repl/GenericReplCompilingEvaluator.kt @@ -63,10 +63,8 @@ class GenericReplCompilingEvaluator(val compiler: ReplCompiler, is ReplEvalResult.ValueResult, is ReplEvalResult.UnitResult -> result - else -> throw IllegalStateException("Unknown evaluator result type $compiled") } } - else -> throw IllegalStateException("Unknown compiler result type $compiled") } } } diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt index c5421ee327d..18603ad9538 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt @@ -325,7 +325,7 @@ object KotlinCompilerClient { if (err != null) { reportingTargets.report(DaemonReportCategory.INFO, (if (attempts >= DAEMON_CONNECT_CYCLE_ATTEMPTS || !autostart) "no more retries on: " else "retrying($attempts) on: ") - + err?.toString()) + + err.toString()) } if (attempts++ > DAEMON_CONNECT_CYCLE_ATTEMPTS || !autostart) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ExternalFunChecker.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ExternalFunChecker.kt index 2574dfd14a9..d0eb1dc2549 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ExternalFunChecker.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/ExternalFunChecker.kt @@ -51,8 +51,7 @@ class ExternalFunChecker : SimpleDeclarationChecker { if (DescriptorUtils.isInterface(descriptor.containingDeclaration)) { diagnosticHolder.report(ErrorsJvm.EXTERNAL_DECLARATION_IN_INTERFACE.on(declaration)) } - else if (descriptor is CallableMemberDescriptor && - descriptor.modality == Modality.ABSTRACT) { + else if (descriptor.modality == Modality.ABSTRACT) { if (declaration is KtPropertyAccessor) { diagnosticHolder.report(ErrorsJvm.EXTERNAL_DECLARATION_CANNOT_BE_ABSTRACT.on(declaration.property)) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt index 284e3856613..d4c27d161c3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCodeFragment.kt @@ -163,7 +163,7 @@ abstract class KtCodeFragment( } fun getContextContainingFile(): KtFile? { - return (getOriginalContext() as? KtElement)?.containingKtFile + return getOriginalContext()?.containingKtFile } fun getOriginalContext(): KtElement? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt index f8ddd2a4ebc..3460b563ee1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtEnumEntrySuperclassReferenceExpression.kt @@ -40,7 +40,7 @@ class KtEnumEntrySuperclassReferenceExpression : get() = calcReferencedElement()!! private fun calcReferencedElement(): KtClass? { - val owner = this.getStrictParentOfType() as? KtEnumEntry + val owner = this.getStrictParentOfType() return owner?.parent?.parent as? KtClass } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ConstModifierChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ConstModifierChecker.kt index e2edf2aa71d..a73411277b8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ConstModifierChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/ConstModifierChecker.kt @@ -65,7 +65,7 @@ object ConstModifierChecker : SimpleDeclarationChecker { return Errors.CONST_VAL_WITH_DELEGATE.on(declaration.delegate!!).nonApplicable() } - if (descriptor is PropertyDescriptor && !descriptor.getter!!.isDefault) { + if (!descriptor.getter!!.isDefault) { return Errors.CONST_VAL_WITH_GETTER.on(declaration.getter!!).nonApplicable() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt index b8d4baab8e8..57409b02df8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.kt @@ -90,6 +90,7 @@ object LabelResolver { if (parent is KtValueArgument) { // f ({}) or f(p = {}) or f (fun () {}) + // NB: parent of KtElement is really nullable!!! val argList = parent.parent ?: return null val call = argList.parent if (call is KtCallExpression) { diff --git a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt index bcae7e68796..467389317a8 100644 --- a/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt +++ b/compiler/incremental-compilation-impl/src/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunner.kt @@ -272,7 +272,6 @@ class IncrementalJvmCompilerRunner( // there is no point in updating annotation file since all files will be compiled anyway kaptAnnotationsFileUpdater = null } - else -> throw IllegalStateException("Unknown CompilationMode ${compilationMode::class.java}") } val currentBuildInfo = BuildInfo(startTS = System.currentTimeMillis()) 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 288aa714638..c8a8f370de4 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 @@ -195,7 +195,7 @@ private fun Scope.createTemporaryVariable(symbol: IrVariableSymbol, initializer: } private fun getDefaultParameterExpressionBody(irFunction: IrFunction, valueParameter: ValueParameterDescriptor):IrExpressionBody { - return irFunction.getDefault(valueParameter) as? IrExpressionBody ?: TODO("FIXME!!!") + return irFunction.getDefault(valueParameter) ?: TODO("FIXME!!!") } private fun maskParameterDescriptor(function: IrFunction, number: Int) = diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt index 552d5a9e131..5f61865253d 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/intrinsics/CompareTo.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.codegen.AsmUtil.comparisonOperandType import org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive import org.jetbrains.kotlin.codegen.OwnerKind import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.ir.expressions.IrCall import org.jetbrains.kotlin.ir.expressions.IrMemberAccessExpression import org.jetbrains.kotlin.ir.expressions.IrStatementOrigin @@ -68,10 +67,10 @@ class IrCompareTo : IntrinsicMethod() { val rightType = argTypes[1] val parameterType = comparisonOperandType(leftType, rightType) - val newSignature = context.state.typeMapper.mapSignatureSkipGeneric(compareCall.descriptor as FunctionDescriptor, OwnerKind.IMPLEMENTATION) + val newSignature = context.state.typeMapper.mapSignatureSkipGeneric(compareCall.descriptor, OwnerKind.IMPLEMENTATION) return object : IrIntrinsicFunction(compareCall, newSignature, context, listOf(parameterType, parameterType)) { override fun invoke(v: InstructionAdapter, codegen: ExpressionCodegen, data: BlockInfo): StackValue { - val isPrimitiveIntrinsic = codegen.intrinsics.intrinsics.getIntrinsic(compareCall.descriptor as FunctionDescriptor) != null + val isPrimitiveIntrinsic = codegen.intrinsics.intrinsics.getIntrinsic(compareCall.descriptor) != null val operationType: Type val leftValue: StackValue val rightValue: StackValue diff --git a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt index 914b8455c2a..7fcf231d62f 100644 --- a/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt +++ b/compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/lower/SyntheticAccessorLowering.kt @@ -81,7 +81,7 @@ class ContextAnnotator(val state: GenerationState) : ClassLowerWithContext() { override fun lowerBefore(irClass: IrClass, data: IrClassContext) { val descriptor = irClass.descriptor - val newContext: CodegenContext<*> = if (descriptor is FileClassDescriptor || descriptor !is ClassDescriptor) { + val newContext: CodegenContext<*> = if (descriptor is FileClassDescriptor) { StubCodegenContext(descriptor, data.parent?.codegenContext, data) } else { diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt index d419153bb2b..177b27be198 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/declarations/impl/IrFieldImpl.kt @@ -59,6 +59,6 @@ class IrFieldImpl( } override fun transformChildren(transformer: IrElementTransformer, data: D) { - initializer = initializer?.transform(transformer, data) as? IrExpressionBody + initializer = initializer?.transform(transformer, data) } } \ No newline at end of file diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt index c029a5438dd..39de7ac4fad 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightMethodImpl.kt @@ -114,7 +114,7 @@ class KtLightMethodImpl private constructor( if (calculatingReturnType.get() == true) { return KotlinJavaPsiFacade.getInstance(project).emptyModifierList } - return super.getModifierList()!! + return super.getModifierList() } override fun getParameterList() = paramsList @@ -235,7 +235,7 @@ fun KtLightMethod.isTraitFakeOverride(): Boolean { } val parentOfMethodOrigin = PsiTreeUtil.getParentOfType(methodOrigin, KtClassOrObject::class.java) - val thisClassDeclaration = (this.containingClass as KtLightClass).kotlinOrigin + val thisClassDeclaration = this.containingClass.kotlinOrigin // Method was generated from declaration in some other trait return (parentOfMethodOrigin != null && thisClassDeclaration !== parentOfMethodOrigin && KtPsiUtil.isTrait(parentOfMethodOrigin)) diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index e8782136f4d..8ebb900c33b 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -670,7 +670,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { fun testDaemonReplLocalEvalNoParams() { withDaemon { daemon -> - val repl = KotlinRemoteReplCompilerClient(daemon!!, null, CompileService.TargetPlatform.JVM, + val repl = KotlinRemoteReplCompilerClient(daemon, null, CompileService.TargetPlatform.JVM, emptyArray(), TestMessageCollector(), classpathFromClassloader(), @@ -685,7 +685,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { fun testDaemonReplLocalEvalStandardTemplate() { withDaemon { daemon -> - val repl = KotlinRemoteReplCompilerClient(daemon!!, null, CompileService.TargetPlatform.JVM, emptyArray(), + val repl = KotlinRemoteReplCompilerClient(daemon, null, CompileService.TargetPlatform.JVM, emptyArray(), TestMessageCollector(), classpathFromClassloader(), "kotlin.script.templates.standard.ScriptTemplateWithArgs") diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt index 2638e21cce6..9369b25dd27 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/CallType.kt @@ -278,8 +278,6 @@ fun CallTypeAndReceiver<*, *>.receiverTypesWithIndex( is CallTypeAndReceiver.ANNOTATION, is CallTypeAndReceiver.UNKNOWN -> return null - - else -> throw RuntimeException() //TODO: see KT-9394 } val resolutionScope = contextElement.getResolutionScope(bindingContext, resolutionFacade) diff --git a/idea/ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt b/idea/ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt index 3f22f514a16..140856a968c 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/util/descriptorUtils.kt @@ -73,7 +73,7 @@ fun ClassDescriptor.findCallableMemberBySignature( if (it.containingDeclaration != this) return@firstOrNull false val overridability = OverridingUtil.DEFAULT.isOverridableBy(it as CallableDescriptor, signature, null).result overridability == OVERRIDABLE || (allowOverridabilityConflicts && overridability == CONFLICT) - } as? CallableMemberDescriptor + } } fun TypeConstructor.supertypesWithAny(): Collection { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt index 534d2629de3..943a303b7ce 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/JavaResolveExtension.kt @@ -128,7 +128,7 @@ private fun JavaDescriptorResolver.resolveConstructor(constructor: JavaConstruct } private fun JavaDescriptorResolver.resolveField(field: JavaField): PropertyDescriptor? { - return getContainingScope(field)?.getContributedVariables(field.name, NoLookupLocation.FROM_IDE)?.findByJavaElement(field) as? PropertyDescriptor + return getContainingScope(field)?.getContributedVariables(field.name, NoLookupLocation.FROM_IDE)?.findByJavaElement(field) } private fun JavaDescriptorResolver.getContainingScope(member: JavaMember): MemberScope? { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt index 54abd4f79e9..28498bd4a0f 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/configuration/BaseKotlinCompilerSettings.kt @@ -64,7 +64,7 @@ abstract class BaseKotlinCompilerSettings protected constructor() override fun getState() = XmlSerializer.serialize(_settings, SKIP_DEFAULT_VALUES) override fun loadState(state: Element) { - _settings = XmlSerializer.deserialize(state, _settings.javaClass) ?: createSettings() + _settings = XmlSerializer.deserialize(state, _settings.javaClass) } public override fun clone(): Any = super.clone() diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt index c9ddec29023..94d8f4b7a8b 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt @@ -139,7 +139,7 @@ class ExpressionsOfTypeProcessor( if (runReadAction { searchScope is GlobalSearchScope && !FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, searchScope) }) return // for class from library always use plain search because we cannot search usages in compiled code (we could though) - if (classToSearch == null || !runReadAction { classToSearch.isValid && ProjectRootsUtil.isInProjectSource(classToSearch) }) { + if (!runReadAction { classToSearch.isValid && ProjectRootsUtil.isInProjectSource(classToSearch) }) { possibleMatchesInScopeHandler(searchScope) return } diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt index 8b72a23c18b..dab9418550e 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KeywordCompletion.kt @@ -254,14 +254,14 @@ object KeywordCompletion { is KtDeclarationWithInitializer -> { val initializer = parent.initializer if (prevParent == initializer) { - return buildFilterWithContext("val v = ", initializer!!, position) + return buildFilterWithContext("val v = ", initializer, position) } } is KtParameter -> { val default = parent.defaultValue if (prevParent == default) { - return buildFilterWithContext("val v = ", default!!, position) + return buildFilterWithContext("val v = ", default, position) } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt index d8d6ce4c916..b80236f0516 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/ExpectedInfos.kt @@ -568,7 +568,6 @@ class ExpectedInfos( } is PropertyGetterDescriptor -> { - if (descriptor !is PropertyGetterDescriptor) return null val property = descriptor.correspondingProperty ExpectedInfo.createForReturnValue(returnTypeToUse(property, hasExplicitReturnType), property) } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt index db3e829ce3d..6d8f490f9ec 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/inspections/gradle/KotlinGradleInspectionVisitor.kt @@ -40,7 +40,7 @@ val KOTLIN_PLUGIN_CLASSPATH_MARKER = "${KotlinWithGradleConfigurator.GROUP_ID}:$ abstract class KotlinGradleInspectionVisitor : BaseInspectionVisitor() { override fun visitFile(file: GroovyFileBase) { - if (file == null || !FileUtilRt.extensionEquals(file.name, GradleConstants.EXTENSION)) return + if (!FileUtilRt.extensionEquals(file.name, GradleConstants.EXTENSION)) return val fileIndex = ProjectRootManager.getInstance(file.project).fileIndex diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt index fe82a69c363..7ad7dbbfe7c 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt @@ -30,7 +30,7 @@ object KotlinStdJSProjectDescriptor : KotlinLightProjectDescriptor() { override fun getSdk(): Sdk? = null override fun configureModule(module: Module, model: ModifiableRootModel) { - val configuration = JSLibraryStdDescription(module.project).createNewLibraryForTests() ?: error("Configuration should exist") + val configuration = JSLibraryStdDescription(module.project).createNewLibraryForTests() val editor = NewLibraryEditor(configuration.libraryType, configuration.properties) configuration.addRoots(editor) diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt index c39b77b0877..00f24596988 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt @@ -69,7 +69,6 @@ fun Module.configureAs(kind: ModuleKind) { this.configureAs(KotlinStdJSProjectDescriptor) } - else -> throw IllegalArgumentException("Unknown kind=$kind") } } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt index ef284092a3c..d75d8cd5f00 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionTypeReceiverToParameterIntention.kt @@ -62,7 +62,7 @@ class ConvertFunctionTypeReceiverToParameterIntention : SelfTargetingRangeIntent class FunctionDefinitionInfo(element: KtFunction) : AbstractProcessableUsageInfo(element) { override fun process(data: ConversionData, elementsToShorten: MutableList) { - val function = element as? KtFunction ?: return + val function = element ?: return val functionParameter = function.valueParameters.getOrNull(data.functionParameterIndex) ?: return val functionType = functionParameter.typeReference?.typeElement as? KtFunctionType ?: return val functionTypeParameterList = functionType.parameterList ?: return diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt index 2643b278fea..03f85025637 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt @@ -196,7 +196,7 @@ class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention statement.returnedExpression diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt index 6eb6bf777a5..465ae9f5fbf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeSuspendInHierarchyFix.kt @@ -150,7 +150,7 @@ class ChangeSuspendInHierarchyFix( return DFS.dfs( listOf(this), - { (it as? FunctionDescriptor)?.getOverridables() ?: emptyList() }, + { it?.getOverridables() ?: emptyList() }, object : DFS.CollectingNodeHandler>(ArrayList()) { override fun afterChildren(current: FunctionDescriptor) { if (current.getOverridables().isEmpty()) { @@ -173,7 +173,7 @@ class ChangeSuspendInHierarchyFix( containingClassDescriptor.defaultType, currentClassDescriptor.defaultType ) ?: return@filter false - val signatureInCurrentClass = it.substitute(substitutor) as? FunctionDescriptor ?: return@filter false + val signatureInCurrentClass = it.substitute(substitutor) ?: return@filter false OverridingUtil.DEFAULT.isOverridableBy(signatureInCurrentClass, currentDescriptor, null).result == OverridingUtil.OverrideCompatibilityInfo.Result.CONFLICT } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index b97e5eb20d7..c4bfbf5a8df 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -586,7 +586,6 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { if (returnTypeRefs.isNotEmpty()) { val returnType = typeCandidates[callableInfo.returnTypeInfo]!!.getTypeByRenderedType( returnTypeRefs.map { it.text } - ?: throw AssertionError("Expression for return type shouldn't be empty: declaration = ${declaration.text}") ) if (returnType != null) { // user selected a given type @@ -603,7 +602,6 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { if (parameterTypeRef != null) { val parameterType = parameterTypeExpressions[i].typeCandidates.getTypeByRenderedType( listOf(parameterTypeRef.text) - ?: throw AssertionError("Expression for parameter type shouldn't be empty: declaration = ${declaration.text}") ) if (parameterType != null) { replaceWithLongerName(listOf(parameterTypeRef), parameterType) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt index 2f8078eb185..5c3b9869fd1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableInfo.kt @@ -102,7 +102,6 @@ abstract class TypeInfo(val variance: Variance) { val classDeclaration = receiverClassDescriptor?.let { DescriptorToSourceUtils.getSourceFromDescriptor(it) } if (!config.isExtension && classDeclaration != null) classDeclaration else config.currentFile } - else -> throw IllegalArgumentException("Unexpected placement: $placement") } return when (containingElement) { is KtClassOrObject -> (containingElement.resolveToDescriptor() as? ClassDescriptorWithResolutionScopes)?.scopeForMemberDeclarationResolution diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt index e1e12470ea3..b457f94f68e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinFunctionCallUsage.kt @@ -334,7 +334,7 @@ class KotlinFunctionCallUsage( if (receiverValue is ExpressionReceiver && !receiverValue.expression.isValid) { receiverValue = receiverValue.wrapInvalidated(element) } - ArgumentInfo(param, index, resolvedArgument, receiverValue as? ReceiverValue) + ArgumentInfo(param, index, resolvedArgument, receiverValue) } val lastParameterIndex = newParameters.lastIndex diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt index 01f58ad9c60..ae2074af9d5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt @@ -182,7 +182,7 @@ data class ExtractionData( fun getPossibleTypes(expression: KtExpression, resolvedCall: ResolvedCall<*>?, context: BindingContext): Set { val dataFlowInfo = context.getDataFlowInfoAfter(expression) - (resolvedCall?.getImplicitReceiverValue() as? ImplicitReceiver)?.let { + resolvedCall?.getImplicitReceiverValue()?.let { return dataFlowInfo.getCollectedTypes(DataFlowValueFactory.createDataFlowValueForStableReceiver(it)) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt index 30c50510803..9ae522abbe4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt @@ -282,7 +282,7 @@ open class KotlinIntroduceParameterHandler( is KtExpression -> matchedElement is KtStringTemplateEntryWithExpression -> matchedElement.expression else -> null - } as? KtExpression + } matchedExpr?.toRange() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt index 10e41c21700..8c100dfaebf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.kt @@ -211,7 +211,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler { actualExpression = reference!! diff = actualExpression.textRange.startOffset - emptyBody.textRange.startOffset actualExpressionText = actualExpression.text - emptyBody = anchor!!.replace(emptyBody) as KtBlockExpression + emptyBody = anchor.replace(emptyBody) as KtBlockExpression elem = findElementByOffsetAndText(diff, actualExpressionText, emptyBody) if (elem != null) { reference = elem as KtExpression @@ -335,7 +335,7 @@ object KotlinIntroduceVariableHandler : RefactoringActionHandler { is KtExpression -> candidate is KtStringTemplateEntryWithExpression -> candidate.expression else -> throw AssertionError("Unexpected candidate element: " + candidate.text) - } as? KtExpression + } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt index e844e081bc2..2478ee5f46e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/kotlinRefactoringUtil.kt @@ -953,7 +953,7 @@ fun checkSuperMethodsWithPopup( .setResizable(false) .setRequestFocus(true) .setItemChoosenCallback { - val value = list.selectedValue as? String ?: return@setItemChoosenCallback + val value = list.selectedValue ?: return@setItemChoosenCallback val chosenElements = if (value == renameBase) deepestSuperMethods + declaration else listOf(declaration) action(chosenElements) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt index 66e16a5ee63..124b8d6d738 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberInfoStorage.kt @@ -100,8 +100,6 @@ fun extractClassMembers( .mapTo(result) { KotlinMemberInfo(it as KtNamedDeclaration, isCompanionMember = isCompanion) } } - if (aClass !is KtClassOrObject) return emptyList() - val result = ArrayList() if (collectSuperTypeEntries) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt index 242d6db7690..d2fd92562ee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesUtil.kt @@ -50,7 +50,7 @@ fun invokeMoveFilesOrDirectoriesRefactoring( project.executeCommand(MoveHandler.REFACTORING_NAME) { val selectedDir = (if (moveDialog != null) moveDialog.targetDirectory else initialTargetDirectory) ?: return@executeCommand - val updatePackageDirective = (moveDialog as? KotlinAwareMoveFilesOrDirectoriesDialog)?.updatePackageDirective + val updatePackageDirective = moveDialog?.updatePackageDirective try { val choice = if (elements.size > 1 || elements[0] is PsiDirectory) intArrayOf(-1) else null diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/markingUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/markingUtils.kt index 38f3d8da606..b1afee98e5f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/markingUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/markingUtils.kt @@ -76,7 +76,6 @@ fun markElements( ?: resolvedCall.extensionReceiver ?: resolvedCall.dispatchReceiver ?: return - if (receiver !is ReceiverValue) return val implicitThis = receiver.type.constructor.declarationDescriptor as? ClassDescriptor ?: return if (implicitThis.isCompanionObject diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameImportAliasByReferenceHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameImportAliasByReferenceHandler.kt index 8d8997e8ca1..03cb6789053 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameImportAliasByReferenceHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameImportAliasByReferenceHandler.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression class RenameImportAliasByReferenceHandler : AbstractReferenceSubstitutionRenameHandler(VariableInplaceRenameHandler()) { override fun getElementToRename(dataContext: DataContext): PsiElement? { - val refExpr = getReferenceExpression(dataContext) as? KtSimpleNameExpression ?: return null + val refExpr = getReferenceExpression(dataContext) ?: return null return refExpr.mainReference.getImportAlias() } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt index f5407430a7a..cd7a1dc8bf0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt @@ -47,7 +47,7 @@ class KotlinOverridingMethodsWithGenericsSearcher : QueryExecutor val found = runReadAction { diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt index 5ec059214e0..0cbc09cbe34 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt @@ -153,13 +153,10 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { collector.showNotification() } - private fun getPathToJar(runtimeState: FileState, jarFromDist: String, jarFromTemp: String): String { - when (runtimeState) { - KotlinWithLibraryConfigurator.FileState.EXISTS -> return jarFromDist - KotlinWithLibraryConfigurator.FileState.COPY -> return jarFromTemp - KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY -> return jarFromDist - } - return jarFromDist + private fun getPathToJar(runtimeState: FileState, jarFromDist: String, jarFromTemp: String) = when (runtimeState) { + KotlinWithLibraryConfigurator.FileState.EXISTS -> jarFromDist + KotlinWithLibraryConfigurator.FileState.COPY -> jarFromTemp + KotlinWithLibraryConfigurator.FileState.DO_NOT_COPY -> jarFromDist } protected fun configure(module: Module, jarState: FileState, configurator: KotlinProjectConfigurator) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt index f8603d6b5ed..c734a0ad632 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/InplaceRenameTest.kt @@ -102,7 +102,7 @@ class InplaceRenameTest : LightPlatformCodeInsightTestCase() { val element = file.findElementForRename(editor.caretModel.offset)!! assertNotNull(element) - val dataContext = SimpleDataContext.getSimpleContext(CommonDataKeys.PSI_ELEMENT.name, element!!, + val dataContext = SimpleDataContext.getSimpleContext(CommonDataKeys.PSI_ELEMENT.name, element, getCurrentEditorDataContext()) val handler = RenameKotlinImplicitLambdaParameter() diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt index 625a33ad81e..c0aa65a1c2e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureTest.kt @@ -157,7 +157,7 @@ class KotlinChangeSignatureTest : KotlinLightCodeInsightFixtureTestCase() { val message = when { e is BaseRefactoringProcessor.ConflictsInTestsException -> StringUtil.join(e.messages.sorted(), "\n") e is CommonRefactoringUtil.RefactoringErrorHintException -> e.message - e is RuntimeException && e.message!!.startsWith("Refactoring cannot be performed") -> e.message + e.message!!.startsWith("Refactoring cannot be performed") -> e.message else -> throw e } val conflictsFile = File(testDataPath + getTestName(false) + "Messages.txt") diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt index 8a1b9052b9c..a5527a379df 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ForConverter.kt @@ -235,7 +235,7 @@ class ForConverter( // check if it's iteration through list indices if (collectionSize is PsiMethodCallExpression && collectionSize.argumentList.expressions.isEmpty()) { val methodExpr = collectionSize.methodExpression - if (methodExpr is PsiReferenceExpression && methodExpr.referenceName == "size") { + if (methodExpr.referenceName == "size") { val qualifier = methodExpr.qualifierExpression if (qualifier is PsiReferenceExpression /* we don't convert to .indices if qualifier is method call or something because of possible side effects */) { val collectionType = PsiElementFactory.SERVICE.getInstance(project).createTypeByFQClassName(CommonClassNames.JAVA_UTIL_COLLECTION) diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt index db136ced8d0..121d74ab20b 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/TypeParameters.kt @@ -72,7 +72,7 @@ private fun Converter.convertTypeParameter(typeParameter: PsiTypeParameter): Typ fun Converter.convertTypeParameterList(typeParameterList: PsiTypeParameterList?): TypeParameterList { return if (typeParameterList != null) - TypeParameterList(typeParameterList.typeParameters!!.toList().map { convertTypeParameter(it) }).assignPrototype(typeParameterList) + TypeParameterList(typeParameterList.typeParameters.toList().map { convertTypeParameter(it) }).assignPrototype(typeParameterList) else TypeParameterList.Empty } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2460aec7f80..cd7b295f01e 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -1094,8 +1094,6 @@ open class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { touch(file) Operation.DELETE -> assertTrue("Can not delete file \"" + file.absolutePath + "\"", file.delete()) - else -> - fail("Unknown operation") } } } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt index 6f5001e7b3b..f8283134768 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings internal class Kotlin2JsCompilerArgumentsSerializer : JpsProjectExtensionSerializer(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION) { override fun loadExtension(project: JpsProject, componentTag: Element) { - val settings = XmlSerializer.deserialize(componentTag, K2JSCompilerArguments::class.java) ?: K2JSCompilerArguments() + val settings = XmlSerializer.deserialize(componentTag, K2JSCompilerArguments::class.java) JpsKotlinCompilerSettings.setK2JsCompilerArguments(project, settings) } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt index ed27868a3c6..4c527f14c88 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt @@ -30,7 +30,7 @@ internal class Kotlin2JvmCompilerArgumentsSerializer : JpsProjectExtensionSerial KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION) { override fun loadExtension(project: JpsProject, componentTag: Element) { - val settings = XmlSerializer.deserialize(componentTag, K2JVMCompilerArguments::class.java) ?: K2JVMCompilerArguments() + val settings = XmlSerializer.deserialize(componentTag, K2JVMCompilerArguments::class.java) JpsKotlinCompilerSettings.setK2JvmCompilerArguments(project, settings) } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt index 2f15f384cfe..db41132e1ba 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt @@ -31,7 +31,6 @@ internal class KotlinCommonCompilerArgumentsSerializer : JpsProjectExtensionSeri override fun loadExtension(project: JpsProject, componentTag: Element) { val settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl::class.java) - ?: CommonCompilerArguments.DummyImpl() if (VersionComparatorUtil.compare(settings.languageVersion, settings.apiVersion) < 0) { settings.apiVersion = settings.languageVersion } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt index 6dbf6c336bf..71e3475bd2f 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt @@ -30,7 +30,7 @@ internal class KotlinCompilerSettingsSerializer : JpsProjectExtensionSerializer( KOTLIN_COMPILER_SETTINGS_SECTION) { override fun loadExtension(project: JpsProject, componentTag: Element) { - val settings = XmlSerializer.deserialize(componentTag, CompilerSettings::class.java) ?: CompilerSettings() + val settings = XmlSerializer.deserialize(componentTag, CompilerSettings::class.java) JpsKotlinCompilerSettings.setCompilerSettings(project, settings) } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index c74408dcba5..b573033f2e8 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -397,9 +397,7 @@ abstract class BasicBoxTest( FileUtil.writeToFile(File(incrementalDir, "$i.$METADATA_EXTENSION"), packagePart.proto) } - incrementalService.headerMetadata?.let { - FileUtil.writeToFile(File(incrementalDir, HEADER_FILE), it) - } + FileUtil.writeToFile(File(incrementalDir, HEADER_FILE), incrementalService.headerMetadata) } processJsProgram(translationResult.program, units.filterIsInstance().map { it.file }) diff --git a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt index 26154e29e6e..1fab2db9df7 100644 --- a/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt +++ b/plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/synthetic/idea/AndroidPsiTreeChangePreprocessor.kt @@ -21,7 +21,6 @@ import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.util.SimpleModificationTracker import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFileManager -import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.impl.PsiTreeChangeEventImpl @@ -83,7 +82,7 @@ class AndroidPsiTreeChangePreprocessor : PsiTreeChangePreprocessor, SimpleModifi val projectFileIndex = ProjectRootManager.getInstance(xmlFile.project).fileIndex val module = projectFileIndex.getModuleForFile(xmlFile.virtualFile) - ?: (element.parent as? PsiDirectory)?.let { projectFileIndex.getModuleForFile(it.virtualFile) } + ?: element.parent?.let { projectFileIndex.getModuleForFile(it.virtualFile) } if (module != null && !module.isDisposed) { val resourceManager = AndroidLayoutXmlFileManager.getInstance(module) ?: return false diff --git a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt index d67cb9cc1f4..755308677a3 100644 --- a/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt +++ b/plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/KotlinUastLanguagePlugin.kt @@ -59,13 +59,11 @@ class KotlinUastLanguagePlugin : UastLanguagePlugin { } override fun convertElement(element: PsiElement, parent: UElement?, requiredType: Class?): UElement? { - if (element !is PsiElement) return null return convertDeclaration(element, parent.toCallback(), requiredType) ?: KotlinConverter.convertPsiElement(element, parent.toCallback(), requiredType) } override fun convertElementWithParent(element: PsiElement, requiredType: Class?): UElement? { - if (element !is PsiElement) return null if (element is PsiFile) return convertDeclaration(element, null, requiredType) if (element is KtLightClassForFacade) return convertDeclaration(element, null, requiredType)