Freezable.{frozen, unfrozen} refactoring: add type safety

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/Freezable.kt

@@ -40,8 +40,10 @@ abstract class Freezable {
 
     private var frozen: Boolean = false
 
-    private fun getInstanceWithFreezeStatus(value: Boolean) = if (value == frozen) this else copyBean(this).apply { frozen = value }
+    internal fun getInstanceWithFreezeStatus(value: Boolean) = if (value == frozen) this else copyBean(this).apply { frozen = value }
-
-    fun frozen() = getInstanceWithFreezeStatus(true)
-    fun unfrozen() = getInstanceWithFreezeStatus(false)
 }
+
+@Suppress("UNCHECKED_CAST")
+fun <T : Freezable> T.frozen(): T = getInstanceWithFreezeStatus(true) as T
+@Suppress("UNCHECKED_CAST")
+fun <T : Freezable> T.unfrozen(): T = getInstanceWithFreezeStatus(false) as T

jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt

@@ -7,10 +7,7 @@ package org.jetbrains.kotlin.config
 
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
-import org.jetbrains.kotlin.cli.common.arguments.Argument
+import org.jetbrains.kotlin.cli.common.arguments.*
-import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
-import org.jetbrains.kotlin.cli.common.arguments.copyBean
-import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments
 import org.jetbrains.kotlin.platform.IdePlatformKind
 import org.jetbrains.kotlin.platform.TargetPlatform
 import org.jetbrains.kotlin.platform.TargetPlatformVersion
@@ -184,13 +181,13 @@ class KotlinFacetSettings {
 
     var compilerArguments: CommonCompilerArguments? = null
         set(value) {
-            field = value?.unfrozen() as CommonCompilerArguments?
+            field = value?.unfrozen()
             updateMergedArguments()
         }
 
     var compilerSettings: CompilerSettings? = null
         set(value) {
-            field = value?.unfrozen() as CompilerSettings?
+            field = value?.unfrozen()
             updateMergedArguments()
         }