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

Kotlin Facet: Switch off "Use project settings" on Maven/Gradle import

Browse Source 
#KT-15682 Fixed
This commit is contained in:
Alexey Sedunov
2017-01-13 19:20:26 +03:00
parent 9f217de10b
commit aeb6af546f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
+1 -1
View File
@@ -107,7 +107,7 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
private fun configureFacet(mavenProject: MavenProject, modifiableModelsProvider: IdeModifiableModelsProvider, module: Module) { private fun configureFacet(mavenProject: MavenProject, modifiableModelsProvider: IdeModifiableModelsProvider, module: Module) {
val compilerVersion = mavenProject.findPlugin(KotlinMavenConfigurator.GROUP_ID, KotlinMavenConfigurator.MAVEN_PLUGIN_ID)?.version val compilerVersion = mavenProject.findPlugin(KotlinMavenConfigurator.GROUP_ID, KotlinMavenConfigurator.MAVEN_PLUGIN_ID)?.version
?: return ?: return
val kotlinFacet = module.getOrCreateFacet(modifiableModelsProvider) val kotlinFacet = module.getOrCreateFacet(modifiableModelsProvider, false)
val platform = detectPlatformByExecutions(mavenProject) ?: detectPlatformByLibraries(mavenProject) val platform = detectPlatformByExecutions(mavenProject) ?: detectPlatformByLibraries(mavenProject)
kotlinFacet.configureFacet(compilerVersion, CoroutineSupport.DEFAULT, platform, modifiableModelsProvider) kotlinFacet.configureFacet(compilerVersion, CoroutineSupport.DEFAULT, platform, modifiableModelsProvider)
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectDataService.kt
+1 -1
View File
@@ -86,7 +86,7 @@ class KotlinGradleProjectDataService : AbstractProjectDataService<GradleSourceSe
val coroutinesProperty = findKotlinCoroutinesProperty(project) val coroutinesProperty = findKotlinCoroutinesProperty(project)
val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider) val kotlinFacet = ideModule.getOrCreateFacet(modelsProvider, false)
kotlinFacet.configureFacet(compilerVersion, coroutinesProperty, platformKind, modelsProvider) kotlinFacet.configureFacet(compilerVersion, coroutinesProperty, platformKind, modelsProvider)
GradleProjectImportHandler.getInstances(project).forEach { it(kotlinFacet, sourceSetNode) } GradleProjectImportHandler.getInstances(project).forEach { it(kotlinFacet, sourceSetNode) }
} }
idea/src/org/jetbrains/kotlin/idea/facet/facetUtils.kt
+2 -2
View File
@@ -150,14 +150,14 @@ val TargetPlatformKind<*>.mavenLibraryId: String
is TargetPlatformKind.Common -> MAVEN_COMMON_STDLIB_ID is TargetPlatformKind.Common -> MAVEN_COMMON_STDLIB_ID
} }
fun Module.getOrCreateFacet(modelsProvider: IdeModifiableModelsProvider): KotlinFacet { fun Module.getOrCreateFacet(modelsProvider: IdeModifiableModelsProvider, useProjectSettings: Boolean): KotlinFacet {
val facetModel = modelsProvider.getModifiableFacetModel(this) val facetModel = modelsProvider.getModifiableFacetModel(this)
facetModel.findFacet(KotlinFacetType.TYPE_ID, KotlinFacetType.INSTANCE.defaultFacetName)?.let { return it } facetModel.findFacet(KotlinFacetType.TYPE_ID, KotlinFacetType.INSTANCE.defaultFacetName)?.let { return it }
val facet = with(KotlinFacetType.INSTANCE) { createFacet(this@getOrCreateFacet, defaultFacetName, createDefaultConfiguration(), null) } val facet = with(KotlinFacetType.INSTANCE) { createFacet(this@getOrCreateFacet, defaultFacetName, createDefaultConfiguration(), null) }
facetModel.addFacet(facet) facetModel.addFacet(facet)
facet.configuration.settings.useProjectSettings = true facet.configuration.settings.useProjectSettings = useProjectSettings
return facet return facet
} }
idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt
+1 -1
View File
@@ -78,7 +78,7 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() {
val accessToken = WriteAction.start() val accessToken = WriteAction.start()
try { try {
val modelsProvider = IdeModifiableModelsProviderImpl(project) val modelsProvider = IdeModifiableModelsProviderImpl(project)
getOrCreateFacet(modelsProvider) getOrCreateFacet(modelsProvider, true)
modelsProvider.commit() modelsProvider.commit()
} }
finally { finally {