azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IDE facet refactoring, ModuleInfo.expectedBy introduced.

Browse Source 
Part of facet classes was extracted to idea-analysis module
Related to KT-21771
This commit is contained in:
Mikhail Glukhikh
2017-12-12 17:22:35 +03:00
parent 694f5690f9
commit 78136fbb07
11 changed files with 129 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinProjectDescriptorWithFacet.kt
+4 -7
View File
@@ -22,16 +22,13 @@ import com.intellij.openapi.roots.ContentEntry
import com.intellij.openapi.roots.ModifiableRootModel
import org.jetbrains.kotlin.config.CompilerSettings
import org.jetbrains.kotlin.config.LanguageVersion
import org.jetbrains.kotlin.idea.facet.KotlinFacet
import org.jetbrains.kotlin.idea.facet.KotlinFacetConfiguration
import org.jetbrains.kotlin.idea.facet.KotlinFacetType
import org.jetbrains.kotlin.idea.facet.initializeIfNeeded
import org.jetbrains.kotlin.idea.facet.*
import org.jetbrains.kotlin.test.testFramework.runInEdtAndWait
import org.jetbrains.kotlin.test.testFramework.runWriteAction
class KotlinProjectDescriptorWithFacet(
private val languageVersion: LanguageVersion,
private val multiPlatform: Boolean = false
private val languageVersion: LanguageVersion,
private val multiPlatform: Boolean = false
) : KotlinLightProjectDescriptor() {
override fun configureModule(module: Module, model: ModifiableRootModel, contentEntry: ContentEntry) {
configureKotlinFacet(module) {
@@ -54,7 +51,7 @@ class KotlinProjectDescriptorWithFacet(
fun configureKotlinFacet(module: Module, configureCallback: KotlinFacetConfiguration.() -> Unit = {}): KotlinFacet {
val facetManager = FacetManager.getInstance(module)
val facetModel = facetManager.createModifiableModel()
val configuration = KotlinFacetConfiguration()
val configuration = KotlinFacetConfigurationImpl()
configuration.settings.initializeIfNeeded(module, null)
configuration.settings.useProjectSettings = false
configuration.configureCallback()