Fix minor compile warnings

idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt

@@ -259,7 +259,7 @@ abstract class KotlinWithLibraryConfigurator protected constructor() : KotlinPro
         }
 
         collector.addMessage(library.name!! + " library was created")
-        return library!!
+        return library
     }
 
     private fun isProjectLibraryPresent(project: Project): Boolean {
@@ -397,14 +397,14 @@ abstract class KotlinWithLibraryConfigurator protected constructor() : KotlinPro
         val project = module.project
         val collector = createConfigureKotlinNotificationCollector(project)
 
-        for (library in findAllUsedLibraries(project).keySet()) {
-            val runtimeJar = LibraryJarDescriptor.RUNTIME_JAR.findExistingJar(library) ?: continue
+        for (lib in findAllUsedLibraries(project).keySet()) {
+            val runtimeJar = LibraryJarDescriptor.RUNTIME_JAR.findExistingJar(lib) ?: continue
 
-            val model = library.modifiableModel
+            val model = lib.modifiableModel
             val libFilesDir = VfsUtilCore.virtualToIoFile(runtimeJar).parent
 
             for (libraryJarDescriptor in libraryJarDescriptors) {
-                if (libraryJarDescriptor.findExistingJar(library) != null) continue
+                if (libraryJarDescriptor.findExistingJar(lib) != null) continue
 
                 val libFile = libraryJarDescriptor.getPathInPlugin()
                 if (!libFile.exists()) continue

idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/ConfigureKotlinNotification.kt

@@ -39,11 +39,11 @@ class ConfigureKotlinNotification(
         }
     }
 ) {
-    override fun equals(o: Any?): Boolean {
-        if (this === o) return true
-        if (o !is ConfigureKotlinNotification) return false
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is ConfigureKotlinNotification) return false
 
-        if (content != o.content) return false
+        if (content != other.content) return false
 
         return true
     }

idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/FileRankingCalculator.kt

@@ -122,8 +122,6 @@ abstract class FileRankingCalculator(private val checkClassFqName: Boolean = tru
         if (function !is KtConstructor<*> && method.name() != descriptor.name.asString())
             return LOW
 
-        val typeMapper = makeTypeMapper(bindingContext)
-
         return collect(
             method.isConstructor && function is KtConstructor<*>,
             method.isAbstract && descriptor.modality == Modality.ABSTRACT,

idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt

@@ -361,6 +361,11 @@ class KotlinFieldBreakpoint(
         }
     }
 
+    // BUNCH: 182
+    override fun getInvalidIcon(isMuted: Boolean): Icon {
+        return AllIcons.Debugger.Db_invalid_breakpoint
+    }
+
     override fun getVerifiedIcon(isMuted: Boolean): Icon {
         return when {
             isMuted -> AllIcons.Debugger.Db_muted_field_breakpoint

idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/compilation/CodeFragmentParameterAnalyzer.kt

@@ -294,6 +294,7 @@ class CodeFragmentParameterAnalyzer(
             is ValueDescriptor -> {
                 parameters.getOrPut(target) {
                     val type = target.type
+                    @Suppress("DEPRECATION")
                     val kind = if (target is LocalVariableDescriptor && target.isDelegated) Kind.DELEGATED else Kind.ORDINARY
                     Smart(Dumb(kind, target.name.asString()), type, target)
                 }

idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/CallUtils.kt

@@ -16,8 +16,6 @@ fun IntermediateStreamCall.withArgs(args: List<CallArgument>) =
 fun TerminatorStreamCall.withArgs(args: List<CallArgument>) =
     TerminatorStreamCallImpl(name, args, typeBefore, resultType, textRange)
 
-fun StreamCall.typeBefore() =
-    if (StreamCall@ this is TypeBeforeAware) StreamCall@ this.typeBefore else KotlinSequenceTypes.ANY
+fun StreamCall.typeBefore() = if (this is TypeBeforeAware) this.typeBefore else KotlinSequenceTypes.ANY
 
-fun StreamCall.typeAfter() =
-    if (StreamCall@ this is TypeAfterAware) StreamCall@ this.typeAfter else KotlinSequenceTypes.ANY
+fun StreamCall.typeAfter() = if (this is TypeAfterAware) this.typeAfter else KotlinSequenceTypes.ANY

idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/trace/impl/handler/sequence/KotlinDistinctByHandler.kt

@@ -72,7 +72,7 @@ class KotlinDistinctByHandler(callNumber: Int, private val call: IntermediateStr
             declare(keys2TimesBefore.defaultDeclaration())
             declare(transitions.defaultDeclaration())
 
-            integerIteration(keys.size(), block@ this) {
+            integerIteration(keys.size(), this) {
                 val key = declare(variable(KotlinSequenceTypes.NULLABLE_ANY, "key"), keys.get(loopVariable), false)
                 val lst = list(dsl.types.INT, "lst")
                 declare(lst, keys2TimesBefore.computeIfAbsent(key, lambda("k") {
@@ -85,7 +85,7 @@ class KotlinDistinctByHandler(callNumber: Int, private val call: IntermediateStr
                 val afterTime = loopVariable
                 val valueAfter = declare(variable(call.typeAfter, "valueAfter"), time2ValueAfter.get(loopVariable), false)
                 val key = declare(variable(KotlinSequenceTypes.NULLABLE_ANY, "key"), nullExpression, true)
-                integerIteration(beforeTimes.size(), forEachLoop@ this) {
+                integerIteration(beforeTimes.size(), this) {
                     ifBranch((valueAfter same beforeValues.get(loopVariable)) and !transitions.contains(beforeTimes.get(loopVariable))) {
                         key assign keys.get(loopVariable)
                         statement { breakIteration() }

idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/makeBackup/MakeBackupCompileTask.kt

@@ -28,7 +28,7 @@ val HISTORY_LABEL_KEY = Key.create<String>("history label")
 
 class MakeBackupCompileTask : CompileTask {
     override fun execute(context: CompileContext?): Boolean {
-        val project = context!!.project!!
+        val project = context!!.project
 
         val localHistory = LocalHistory.getInstance()!!
         val label = HISTORY_LABEL_PREFIX + Integer.toHexString(random.nextInt())