Extract interface from KotlinFacetSettings

#KTIJ-24647 In Process GitOrigin-RevId: 70d81e826fe64afd3eaee46bb3ade855b76bcf41
JetBrains · Aug 22, 2023 · f0094db · f0094db
1 parent 7abb4e0
commit f0094db
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 66 deletions.
diff --git a/...ins/kotlin/idea/base/compilerPreferences/configuration/KotlinCompilerConfigurableTab.java b/...ins/kotlin/idea/base/compilerPreferences/configuration/KotlinCompilerConfigurableTab.java
@@ -176,7 +176,7 @@ public KotlinCompilerConfigurableTab(
                     module -> {
                         KotlinFacet facet = KotlinFacet.Companion.get(module);
                         if (facet == null) return null;
-                        KotlinFacetSettings facetSettings = facet.getConfiguration().getSettings();
+                        IKotlinFacetSettings facetSettings = facet.getConfiguration().getSettings();
                         if (facetSettings.getUseProjectSettings()) return null;
                         return module.getName();
                     }

diff --git a/...ation/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinFacetSettingsProvider.kt b/...ation/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinFacetSettingsProvider.kt
@@ -6,8 +6,8 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.project.Project
 
 interface KotlinFacetSettingsProvider {
-    fun getSettings(module: Module): KotlinFacetSettings?
-    fun getInitializedSettings(module: Module): KotlinFacetSettings
+    fun getSettings(module: Module): IKotlinFacetSettings?
+    fun getInitializedSettings(module: Module): IKotlinFacetSettings
 
     companion object {
         fun getInstance(project: Project): KotlinFacetSettingsProvider? =

diff --git a/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/base/facet/KotlinFacetUtils.kt b/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/base/facet/KotlinFacetUtils.kt
@@ -74,10 +74,10 @@ var Module.refinesFragmentIds: Collection<String>
 val Module.isTestModule: Boolean
     get() = facetSettings?.isTestModule ?: false
 
-val KotlinFacetSettings.isMultiPlatformModule: Boolean
+val IKotlinFacetSettings.isMultiPlatformModule: Boolean
     get() = mppVersion != null
 
-private val Module.facetSettings: KotlinFacetSettings?
+private val Module.facetSettings: IKotlinFacetSettings?
     get() = KotlinFacet.get(this)?.configuration?.settings
 
 @Service(Service.Level.PROJECT)

diff --git a/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/facet/KotlinFacetConfiguration.kt b/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/facet/KotlinFacetConfiguration.kt
@@ -3,8 +3,8 @@
 package org.jetbrains.kotlin.idea.facet
 
 import com.intellij.facet.FacetConfiguration
-import org.jetbrains.kotlin.config.KotlinFacetSettings
+import org.jetbrains.kotlin.config.IKotlinFacetSettings
 
 interface KotlinFacetConfiguration : FacetConfiguration {
-    val settings: KotlinFacetSettings
+    val settings: IKotlinFacetSettings
 }
diff --git a/.../kotlin/base/facet/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt b/.../kotlin/base/facet/src/org/jetbrains/kotlin/idea/facet/KotlinFacetSettingsProviderImpl.kt
@@ -12,22 +12,23 @@ import com.intellij.workspaceModel.ide.impl.legacyBridge.module.findModule
 import com.intellij.platform.workspace.storage.VersionedStorageChange
 import com.intellij.platform.workspace.jps.entities.FacetEntity
 import com.intellij.platform.workspace.jps.entities.ModuleEntity
+import org.jetbrains.kotlin.config.IKotlinFacetSettings
 import org.jetbrains.kotlin.config.KotlinFacetSettings
 import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
 import org.jetbrains.kotlin.idea.base.util.caching.*
 import org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerSettingsListener
 
 class KotlinFacetSettingsProviderImpl(project: Project) :
-    SynchronizedFineGrainedEntityCache<Module, KotlinFacetSettings>(project, doSelfInitialization = false),
+    SynchronizedFineGrainedEntityCache<Module, IKotlinFacetSettings>(project, doSelfInitialization = false),
     WorkspaceModelChangeListener,
     KotlinCompilerSettingsListener,
     KotlinFacetSettingsProvider {
 
     override fun getSettings(module: Module) = KotlinFacet.get(module)?.configuration?.settings
 
-    override fun getInitializedSettings(module: Module): KotlinFacetSettings = runReadAction { get(module) }
+    override fun getInitializedSettings(module: Module): IKotlinFacetSettings = runReadAction { get(module) }
 
-    override fun calculate(key: Module): KotlinFacetSettings {
+    override fun calculate(key: Module): IKotlinFacetSettings {
         val kotlinFacetSettings = getSettings(key) ?: KotlinFacetSettings()
         kotlinFacetSettings.initializeIfNeeded(key, null)
         return kotlinFacetSettings

diff --git a/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/facet/KotlinFacetUtils.kt b/plugins/kotlin/base/facet/src/org/jetbrains/kotlin/idea/facet/KotlinFacetUtils.kt
@@ -34,7 +34,7 @@ import kotlin.reflect.KProperty1
 
 var Module.hasExternalSdkConfiguration: Boolean by NotNullableUserDataProperty(Key.create("HAS_EXTERNAL_SDK_CONFIGURATION"), false)
 
-fun KotlinFacetSettings.initializeIfNeeded(
+fun IKotlinFacetSettings.initializeIfNeeded(
     module: Module,
     rootModel: ModuleRootModel?,
     platform: TargetPlatform? = null, // if null, detect by module dependencies

diff --git a/...re/src/org/jetbrains/kotlin/idea/base/projectStructure/LanguageVersionSettingsProvider.kt b/...re/src/org/jetbrains/kotlin/idea/base/projectStructure/LanguageVersionSettingsProvider.kt
@@ -190,7 +190,7 @@ class LanguageVersionSettingsProvider(private val project: Project) : Disposable
         return LanguageVersionSettingsImpl(languageVersion, apiVersion, analysisFlags, languageFeatures)
     }
 
-    private fun getLanguageApiVersionFromFacet(facetSettings: KotlinFacetSettings): Pair<LanguageVersion, ApiVersion> {
+    private fun getLanguageApiVersionFromFacet(facetSettings: IKotlinFacetSettings): Pair<LanguageVersion, ApiVersion> {
         val languageVersion = facetSettings.languageLevel
         val apiVersion = facetSettings.apiLevel?.let { ApiVersion.createByLanguageVersion(it) }
 
@@ -250,7 +250,7 @@ class LanguageVersionSettingsProvider(private val project: Project) : Disposable
         return CommonFacetSettings(analysisFlags, languageFeatures)
     }
 
-    private fun getMultiPlatformLanguageFeatures(module: Module, facetSettings: KotlinFacetSettings): LanguageFeatureMap {
+    private fun getMultiPlatformLanguageFeatures(module: Module, facetSettings: IKotlinFacetSettings): LanguageFeatureMap {
         if (facetSettings.targetPlatform.isCommon() || ModuleRootManager.getInstance(module).dependencies.any { it.platform.isCommon() }) {
             return Collections.singletonMap(LanguageFeature.MultiPlatformProjects, LanguageFeature.State.ENABLED)
         }

diff --git a/...rc/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt b/...rc/org/jetbrains/kotlin/idea/gradleJava/configuration/KotlinGradleSourceSetDataService.kt
@@ -26,8 +26,8 @@ import com.intellij.openapi.util.Key
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
+import org.jetbrains.kotlin.config.IKotlinFacetSettings
 import org.jetbrains.kotlin.config.JvmTarget
-import org.jetbrains.kotlin.config.KotlinFacetSettings
 import org.jetbrains.kotlin.config.TargetPlatformKind
 import org.jetbrains.kotlin.extensions.ProjectExtensionDescriptor
 import org.jetbrains.kotlin.idea.base.codeInsight.tooling.tooling
@@ -326,7 +326,7 @@ fun configureFacetByGradleModule(
     return kotlinFacet
 }
 
-private fun KotlinFacetSettings.configureOutputPaths(moduleNode: DataNode<ModuleData>, platformKind: IdePlatformKind?) {
+private fun IKotlinFacetSettings.configureOutputPaths(moduleNode: DataNode<ModuleData>, platformKind: IdePlatformKind?) {
     if (!platformKind.isJavaScript) {
         productionOutputPath = null
         testOutputPath = null

diff --git a/...tlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecker.kt b/...tlin/gradle/multiplatformTests/testFeatures/checkers/facets/KotlinFacetSettingsChecker.kt
@@ -3,16 +3,13 @@ package org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.fac
 
 import com.intellij.openapi.application.runReadAction
 import com.intellij.openapi.module.Module
-import org.jetbrains.kotlin.config.CompilerSettings
-import org.jetbrains.kotlin.config.KotlinFacetSettings
-import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
-import org.jetbrains.kotlin.config.LanguageVersion
+import org.jetbrains.kotlin.config.*
 import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfiguration
 import org.jetbrains.kotlin.gradle.multiplatformTests.workspace.*
 import org.jetbrains.kotlin.platform.TargetPlatform
 import kotlin.reflect.KProperty1
 
-internal typealias FacetField = KProperty1<KotlinFacetSettings, *>
+internal typealias FacetField = KProperty1<IKotlinFacetSettings, *>
 
 object KotlinFacetSettingsChecker : WorkspaceModelChecker<KotlinFacetSettingsChecksConfiguration>(respectOrder = true) {
     override fun createDefaultConfiguration(): KotlinFacetSettingsChecksConfiguration = KotlinFacetSettingsChecksConfiguration()
@@ -89,14 +86,14 @@ object KotlinFacetSettingsChecker : WorkspaceModelChecker<KotlinFacetSettingsChe
     }
 
     private val ALL_FACET_FIELDS_TO_PRINT = setOf<FacetField>(
-        KotlinFacetSettings::externalProjectId,
-        KotlinFacetSettings::languageLevel,
-        KotlinFacetSettings::apiLevel,
-        KotlinFacetSettings::mppVersion,
-        KotlinFacetSettings::dependsOnModuleNames,
-        KotlinFacetSettings::additionalVisibleModuleNames,
-        KotlinFacetSettings::targetPlatform,
-        KotlinFacetSettings::compilerSettings
+        IKotlinFacetSettings::externalProjectId,
+        IKotlinFacetSettings::languageLevel,
+        IKotlinFacetSettings::apiLevel,
+        IKotlinFacetSettings::mppVersion,
+        IKotlinFacetSettings::dependsOnModuleNames,
+        IKotlinFacetSettings::additionalVisibleModuleNames,
+        IKotlinFacetSettings::targetPlatform,
+        IKotlinFacetSettings::compilerSettings
     )
 
     private val CURRENT_KGP_LANGUAGE_VERSION_PLACEHOLDER = "{{LATEST_STABLE}}"

diff --git a/...dle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt b/...dle-java/tests/test/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleFacetImportTest.kt
@@ -46,15 +46,15 @@ import org.jetbrains.plugins.gradle.tooling.annotation.TargetVersions
 import org.junit.Ignore
 import org.junit.Test
 
-fun KotlinGradleImportingTestCase.facetSettings(moduleName: String): KotlinFacetSettings {
+fun KotlinGradleImportingTestCase.facetSettings(moduleName: String): IKotlinFacetSettings {
     val facet = KotlinFacet.get(getModule(moduleName)) ?: error("Kotlin facet not found in module $moduleName")
     return facet.configuration.settings
 }
 
-val KotlinGradleImportingTestCase.facetSettings: KotlinFacetSettings
+val KotlinGradleImportingTestCase.facetSettings: IKotlinFacetSettings
     get() = facetSettings("project.main")
 
-val KotlinGradleImportingTestCase.testFacetSettings: KotlinFacetSettings
+val KotlinGradleImportingTestCase.testFacetSettings: IKotlinFacetSettings
     get() = facetSettings("project.test")
 
 class GradleFacetImportTest8 : KotlinGradleImportingTestCase() {

diff --git a/...tlin/gradle/idea/importing/multiplatformTests/KotlinMppCompilerArgumentsImportingTests.kt b/...tlin/gradle/idea/importing/multiplatformTests/KotlinMppCompilerArgumentsImportingTests.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.kotlin.gradle.idea.importing.multiplatformTests
 
-import org.jetbrains.kotlin.config.KotlinFacetSettings
+import org.jetbrains.kotlin.config.IKotlinFacetSettings
 import org.jetbrains.kotlin.gradle.multiplatformTests.AbstractKotlinMppGradleImportingTest
 import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfigurationDslScope
 import org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.facets.KotlinFacetSettingsChecker
@@ -19,9 +19,9 @@ class KotlinMppCompilerArgumentsImportingTests : AbstractKotlinMppGradleImportin
 
         onlyCheckers(KotlinFacetSettingsChecker)
         onlyFacetFields(
-            KotlinFacetSettings::languageLevel,
-            KotlinFacetSettings::apiLevel,
-            KotlinFacetSettings::compilerSettings
+            IKotlinFacetSettings::languageLevel,
+            IKotlinFacetSettings::apiLevel,
+            IKotlinFacetSettings::compilerSettings
         )
         hideLineMarkers = true
         hideResourceRoots = true
@@ -74,10 +74,10 @@ class KotlinMppCompilerArgumentsImportingTests : AbstractKotlinMppGradleImportin
     fun testCompilerOptionsInCompilationTaskKJvm() {
         doTest {
             onlyFacetFields(
-                KotlinFacetSettings::languageLevel,
-                KotlinFacetSettings::apiLevel,
-                KotlinFacetSettings::compilerSettings,
-                KotlinFacetSettings::targetPlatform
+                IKotlinFacetSettings::languageLevel,
+                IKotlinFacetSettings::apiLevel,
+                IKotlinFacetSettings::compilerSettings,
+                IKotlinFacetSettings::targetPlatform
             )
         }
     }

diff --git a/...n/gradle/idea/importing/multiplatformTests/KotlinMppExperimentalTierCasesImportingTest.kt b/...n/gradle/idea/importing/multiplatformTests/KotlinMppExperimentalTierCasesImportingTest.kt
@@ -2,7 +2,7 @@
 package org.jetbrains.kotlin.gradle.idea.importing.multiplatformTests
 
 import com.intellij.lang.annotation.HighlightSeverity
-import org.jetbrains.kotlin.config.KotlinFacetSettings
+import org.jetbrains.kotlin.config.IKotlinFacetSettings
 import org.jetbrains.kotlin.gradle.multiplatformTests.AbstractKotlinMppGradleImportingTest
 import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfigurationDslScope
 import org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.facets.KotlinFacetSettingsChecker
@@ -150,7 +150,7 @@ class KotlinMppExperimentalTierCasesImportingTest : AbstractKotlinMppGradleImpor
     fun testSimilarTargetsBamboo() {
         doTest {
             onlyCheckers(KotlinFacetSettingsChecker, OrderEntriesChecker)
-            onlyFacetFields(KotlinFacetSettings::targetPlatform)
+            onlyFacetFields(IKotlinFacetSettings::targetPlatform)
         }
     }
 }
diff --git a/...rains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppMiscCasesImportingTests.kt b/...rains/kotlin/gradle/idea/importing/multiplatformTests/KotlinMppMiscCasesImportingTests.kt
@@ -2,7 +2,7 @@
 package org.jetbrains.kotlin.gradle.idea.importing.multiplatformTests
 
 import com.intellij.lang.annotation.HighlightSeverity
-import org.jetbrains.kotlin.config.KotlinFacetSettings
+import org.jetbrains.kotlin.config.IKotlinFacetSettings
 import org.jetbrains.kotlin.gradle.multiplatformTests.AbstractKotlinMppGradleImportingTest
 import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfigurationDslScope
 import org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.contentRoots.ContentRootsChecker
@@ -21,7 +21,7 @@ class KotlinMppMiscCasesImportingTests : AbstractKotlinMppGradleImportingTest()
         hideKotlinTest = true
         hideKotlinNativeDistribution = true
 
-        onlyFacetFields(KotlinFacetSettings::targetPlatform)
+        onlyFacetFields(IKotlinFacetSettings::targetPlatform)
 
         hideResourceRoots = true
     }
@@ -183,7 +183,7 @@ class KotlinMppMiscCasesImportingTests : AbstractKotlinMppGradleImportingTest()
     fun testAssociateCompilationIntegrationTest() {
         doTest {
             onlyCheckers(HighlightingChecker, KotlinFacetSettingsChecker)
-            onlyFacetFields(KotlinFacetSettings::additionalVisibleModuleNames)
+            onlyFacetFields(IKotlinFacetSettings::additionalVisibleModuleNames)
             hideLineMarkers = true
         }
     }

diff --git a/...tbrains/kotlin/gradle/idea/importing/multiplatformTests/PrecisePlatformsImportingTests.kt b/...tbrains/kotlin/gradle/idea/importing/multiplatformTests/PrecisePlatformsImportingTests.kt
@@ -1,7 +1,7 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.kotlin.gradle.idea.importing.multiplatformTests
 
-import org.jetbrains.kotlin.config.KotlinFacetSettings
+import org.jetbrains.kotlin.config.IKotlinFacetSettings
 import org.jetbrains.kotlin.gradle.multiplatformTests.AbstractKotlinMppGradleImportingTest
 import org.jetbrains.kotlin.gradle.multiplatformTests.TestConfigurationDslScope
 import org.jetbrains.kotlin.gradle.multiplatformTests.testFeatures.checkers.facets.KotlinFacetSettingsChecker
@@ -12,7 +12,7 @@ import org.junit.Test
 class PrecisePlatformsImportingTests : AbstractKotlinMppGradleImportingTest() {
     override fun TestConfigurationDslScope.defaultTestConfiguration() {
         onlyCheckers(KotlinFacetSettingsChecker)
-        onlyFacetFields(KotlinFacetSettings::targetPlatform)
+        onlyFacetFields(IKotlinFacetSettings::targetPlatform)
     }
 
     @Test

diff --git a/...ighlighting/highlighting-k1/src/org/jetbrains/kotlin/idea/highlighter/ElementAnnotator.kt b/...ighlighting/highlighting-k1/src/org/jetbrains/kotlin/idea/highlighter/ElementAnnotator.kt
@@ -15,6 +15,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.util.containers.MultiMap
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
 import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider
+import org.jetbrains.kotlin.config.isCompilerSettingPresent
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.diagnostics.Severity

diff --git a/...s/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java b/...s/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinTest.java
@@ -25,10 +25,7 @@
 import org.jetbrains.kotlin.cli.common.arguments.InternalArgument;
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments;
 import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
-import org.jetbrains.kotlin.config.JvmTarget;
-import org.jetbrains.kotlin.config.KotlinFacetSettings;
-import org.jetbrains.kotlin.config.KotlinFacetSettingsProvider;
-import org.jetbrains.kotlin.config.LanguageVersion;
+import org.jetbrains.kotlin.config.*;
 import org.jetbrains.kotlin.idea.base.facet.platform.TargetPlatformDetectorUtils;
 import org.jetbrains.kotlin.idea.base.indices.JavaIndicesUtils;
 import org.jetbrains.kotlin.idea.base.platforms.KotlinJavaScriptLibraryKind;
@@ -196,7 +193,7 @@ public void testMavenProvidedTestJsKind() {
     }
 
     public void testJvmProjectWithV1FacetConfig() {
-        KotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
+        IKotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
         K2JVMCompilerArguments arguments = (K2JVMCompilerArguments) settings.getCompilerArguments();
         assertFalse(settings.getUseProjectSettings());
         assertEquals(LanguageVersion.KOTLIN_1_1, settings.getLanguageLevel());
@@ -210,7 +207,7 @@ public void testJvmProjectWithV1FacetConfig() {
     }
 
     public void testJsProjectWithV1FacetConfig() {
-        KotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
+        IKotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
         K2JSCompilerArguments arguments = (K2JSCompilerArguments) settings.getCompilerArguments();
         assertFalse(settings.getUseProjectSettings());
         assertEquals(LanguageVersion.KOTLIN_1_1, settings.getLanguageLevel());
@@ -223,7 +220,7 @@ public void testJsProjectWithV1FacetConfig() {
     }
 
     public void testJvmProjectWithV2FacetConfig() {
-        KotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
+        IKotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
         K2JVMCompilerArguments arguments = (K2JVMCompilerArguments) settings.getCompilerArguments();
         assertFalse(settings.getUseProjectSettings());
         assertEquals(LanguageVersion.KOTLIN_1_1, settings.getLanguageLevel());
@@ -237,7 +234,7 @@ public void testJvmProjectWithV2FacetConfig() {
     }
 
     public void testJsProjectWithV2FacetConfig() {
-        KotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
+        IKotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
         K2JSCompilerArguments arguments = (K2JSCompilerArguments) settings.getCompilerArguments();
         assertFalse(settings.getUseProjectSettings());
         assertEquals(LanguageVersion.KOTLIN_1_1, settings.getLanguageLevel());
@@ -250,7 +247,7 @@ public void testJsProjectWithV2FacetConfig() {
     }
 
     public void testJvmProjectWithV3FacetConfig() {
-        KotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
+        IKotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
         K2JVMCompilerArguments arguments = (K2JVMCompilerArguments) settings.getCompilerArguments();
         assertFalse(settings.getUseProjectSettings());
         assertEquals(LanguageVersion.KOTLIN_1_1, settings.getLanguageLevel());
@@ -264,7 +261,7 @@ public void testJvmProjectWithV3FacetConfig() {
     }
 
     public void testJvmProjectWithV4FacetConfig() {
-        KotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
+        IKotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
         K2JVMCompilerArguments arguments = (K2JVMCompilerArguments) settings.getCompilerArguments();
         assertFalse(settings.getUseProjectSettings());
         assertEquals(LanguageVersion.KOTLIN_1_4, settings.getLanguageLevel());
@@ -277,7 +274,7 @@ public void testJvmProjectWithV4FacetConfig() {
     }
 
     public void testJvmProjectWithJvmTarget11() {
-        KotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
+        IKotlinFacetSettings settings = KotlinFacetSettingsProvider.Companion.getInstance(myProject).getInitializedSettings(getModule());
         assertEquals(JvmPlatforms.INSTANCE.jvmPlatformByTargetVersion(JvmTarget.JVM_11), settings.getTargetPlatform());
     }