diff --git a/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptNameUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptNameUtil.kt index bf889fbb62d..f229eeff8b5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptNameUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptNameUtil.kt @@ -31,7 +31,7 @@ object ScriptNameUtil { .map { if (it.startsWith('.')) it else ".$it" } .firstOrNull { fileName.endsWith(it) } ?.let { fileName.length - it.length } - ?: fileName.lastIndexOf('.')?.let { if (it < 0) fileName.length else it } + ?: fileName.lastIndexOf('.').let { if (it < 0) fileName.length else it } ?: fileName.length return fileName .substring(nameStart, nameEnd) diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt index fec4f405888..f5c9bbce839 100644 --- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt +++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/KotlinCompletionContributor.kt @@ -168,7 +168,7 @@ class KotlinCompletionContributor : CompletionContributor() { val classOrObject = tokenBefore?.parents?.firstIsInstanceOrNull() ?: return false val name = classOrObject.nameIdentifier ?: return false val body = classOrObject.getBody() ?: return false - val offset = tokenBefore!!.startOffset + val offset = tokenBefore.startOffset return name.endOffset <= offset && offset <= body.startOffset } @@ -180,7 +180,7 @@ class KotlinCompletionContributor : CompletionContributor() { val lambda = leaf?.parents?.firstOrNull { it is KtFunctionLiteral } ?: return null - val lambdaChild = leaf!!.parents.takeWhile { it != lambda }.lastOrNull() + val lambdaChild = leaf.parents.takeWhile { it != lambda }.lastOrNull() return if (lambdaChild is KtParameterList) CompletionUtilCore.DUMMY_IDENTIFIER_TRIMMED diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/FrameVisitor.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/FrameVisitor.kt index a48cbdbe21b..2d85efcc61a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/FrameVisitor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/FrameVisitor.kt @@ -133,7 +133,7 @@ class FrameVisitor(context: EvaluationContextImpl) { private fun isFunctionType(type: Type?): Boolean { return type?.sort == Type.OBJECT && - type!!.internalName.startsWith(InlineCodegenUtil.NUMBERED_FUNCTION_PREFIX) + type.internalName.startsWith(InlineCodegenUtil.NUMBERED_FUNCTION_PREFIX) } private fun findLocalVariable(name: String, asmType: Type?, checkType: Boolean): Value? { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt index 80cbe7d21fd..cc15b67bba9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt @@ -79,7 +79,7 @@ class AddLoopLabelFix(loop: KtLoopExpression, val jumpExpression: KtElement): Ko assert(element is KtBreakExpression || element is KtContinueExpression) assert((element as? KtLabeledExpression)?.getLabelName() == null) val loop = element?.getStrictParentOfType() ?: return null - return AddLoopLabelFix(loop, element!!) + return AddLoopLabelFix(loop, element) } } } \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinParameterUsage.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinParameterUsage.kt index 997f97a2808..8aefd4ed2ee 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinParameterUsage.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/KotlinParameterUsage.kt @@ -51,7 +51,7 @@ class KotlinParameterUsage( ) : KotlinExplicitReferenceUsage(element) { override fun processReplacedElement(element: KtElement) { val qualifiedExpression = element.parent as? KtQualifiedExpression - val elementToShorten = if (qualifiedExpression?.receiverExpression == element) qualifiedExpression!! else element + val elementToShorten = if (qualifiedExpression?.receiverExpression == element) qualifiedExpression else element elementToShorten.addToShorteningWaitSet(Options(removeThis = true, removeThisLabels = true)) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index 0bbd831f97f..fd0913376cf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -720,7 +720,7 @@ private fun ExtractionData.suggestFunctionNames(returnType: KotlinType): List val property = expr.getStrictParentOfType() if (property?.initializer == expr) { - property?.name?.let { functionNames.add(KotlinNameSuggester.suggestNameByName("get" + it.capitalize(), validator)) } + property.name?.let { functionNames.add(KotlinNameSuggester.suggestNameByName("get" + it.capitalize(), validator)) } } } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt index 27840fcd12b..3d659545b97 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/StatementConverter.kt @@ -235,7 +235,7 @@ class DefaultStatementConverter : JavaElementVisitor(), StatementConverter { override fun visitWhileStatement(statement: PsiWhileStatement) { val condition = statement.condition val expression = if (condition?.type != null) - codeConverter.convertExpression(condition, condition!!.type) + codeConverter.convertExpression(condition, condition.type) else codeConverter.convertExpression(condition) result = WhileStatement(expression, codeConverter.convertStatementOrBlock(statement.body), statement.isInSingleLine()) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/typePredicates/typePredicates.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/typePredicates/typePredicates.kt index 2f0316ff4a3..589dc41968d 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/typePredicates/typePredicates.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/typePredicates/typePredicates.kt @@ -46,7 +46,7 @@ private class TypePredicateImpl for (i in nameParts.lastIndex downTo 0) { if (nameParts[i] != descriptor?.name?.asString()) return false - descriptor = descriptor?.containingDeclaration + descriptor = descriptor.containingDeclaration } return true diff --git a/plugins/lint/uast-android/src/org/jetbrains/uast/check/androidUtils.kt b/plugins/lint/uast-android/src/org/jetbrains/uast/check/androidUtils.kt index 820ab6de340..8817ea00fb6 100644 --- a/plugins/lint/uast-android/src/org/jetbrains/uast/check/androidUtils.kt +++ b/plugins/lint/uast-android/src/org/jetbrains/uast/check/androidUtils.kt @@ -27,6 +27,6 @@ fun UElement?.getLocation(): Location? { val psiFile = psiElement?.containingFile ?: return null val vfile = psiFile.virtualFile val file = VfsUtilCore.virtualToIoFile(vfile) - val range = psiElement?.textRange ?: return null + val range = psiElement.textRange ?: return null return Location.create(file, psiFile.text, range.startOffset, range.endOffset) } \ No newline at end of file