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

Reformat ConfigureKotlinInProjectUtils

Browse Source
This commit is contained in:
Vyacheslav Gerasimov
2018-06-26 16:30:46 +03:00
parent 62c0d37d45
commit 16b4d25c1d
1 changed files with 46 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+46 -38
View File
@@ -49,33 +49,35 @@ data class RepositoryDescription(val id: String, val name: String, val url: Stri
const val LAST_SNAPSHOT_VERSION = "1.2-SNAPSHOT" const val LAST_SNAPSHOT_VERSION = "1.2-SNAPSHOT"
val SNAPSHOT_REPOSITORY = RepositoryDescription( val SNAPSHOT_REPOSITORY = RepositoryDescription(
"sonatype.oss.snapshots", "sonatype.oss.snapshots",
"Sonatype OSS Snapshot Repository", "Sonatype OSS Snapshot Repository",
"http://oss.sonatype.org/content/repositories/snapshots", "http://oss.sonatype.org/content/repositories/snapshots",
null, null,
isSnapshot = true) isSnapshot = true
)
val EAP_REPOSITORY = RepositoryDescription( val EAP_REPOSITORY = RepositoryDescription(
"bintray.kotlin.eap", "bintray.kotlin.eap",
"Bintray Kotlin EAP Repository", "Bintray Kotlin EAP Repository",
"http://dl.bintray.com/kotlin/kotlin-eap", "http://dl.bintray.com/kotlin/kotlin-eap",
"https://bintray.com/kotlin/kotlin-eap/kotlin/", "https://bintray.com/kotlin/kotlin-eap/kotlin/",
isSnapshot = false) isSnapshot = false
)
val DEFAULT_GRADLE_PLUGIN_REPOSITORY = RepositoryDescription( val DEFAULT_GRADLE_PLUGIN_REPOSITORY = RepositoryDescription(
"default.gradle.plugins", "default.gradle.plugins",
"Default Gradle Plugin Repository", "Default Gradle Plugin Repository",
"https://plugins.gradle.org/m2/", "https://plugins.gradle.org/m2/",
null, null,
isSnapshot = false isSnapshot = false
) )
fun devRepository(version: String) = RepositoryDescription( fun devRepository(version: String) = RepositoryDescription(
"teamcity.kotlin.dev", "teamcity.kotlin.dev",
"Teamcity Repository of Kotlin Development Builds", "Teamcity Repository of Kotlin Development Builds",
"https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:$version,branch:default:any/artifacts/content/maven/", "https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:$version,branch:default:any/artifacts/content/maven/",
null, null,
isSnapshot = false isSnapshot = false
) )
val MAVEN_CENTRAL = "mavenCentral()" val MAVEN_CENTRAL = "mavenCentral()"
@@ -85,7 +87,7 @@ val JCENTER = "jcenter()"
val KOTLIN_GROUP_ID = "org.jetbrains.kotlin" val KOTLIN_GROUP_ID = "org.jetbrains.kotlin"
fun isRepositoryConfigured(repositoriesBlockText: String): Boolean = fun isRepositoryConfigured(repositoriesBlockText: String): Boolean =
repositoriesBlockText.contains(MAVEN_CENTRAL) || repositoriesBlockText.contains(JCENTER) repositoriesBlockText.contains(MAVEN_CENTRAL) || repositoriesBlockText.contains(JCENTER)
fun DependencyScope.toGradleCompileScope(isAndroidModule: Boolean) = when (this) { fun DependencyScope.toGradleCompileScope(isAndroidModule: Boolean) = when (this) {
DependencyScope.COMPILE -> "compile" DependencyScope.COMPILE -> "compile"
@@ -119,17 +121,19 @@ fun isModuleConfigured(moduleSourceRootGroup: ModuleSourceRootGroup): Boolean {
*/ */
fun getModulesWithKotlinFiles(project: Project): Collection<Module> { fun getModulesWithKotlinFiles(project: Project): Collection<Module> {
if (!runReadAction { if (!runReadAction {
!project.isDisposed && FileTypeIndex.containsFileOfType (KotlinFileType.INSTANCE, GlobalSearchScope.projectScope(project)) !project.isDisposed &&
}) { FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, GlobalSearchScope.projectScope(project))
}) {
return emptyList() return emptyList()
} }
return project.allModules() return project.allModules()
.filter { module -> .filter { module ->
runReadAction { runReadAction {
!project.isDisposed && FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(true)) !project.isDisposed &&
} FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(true))
} }
}
} }
/** /**
@@ -195,13 +199,13 @@ fun allConfigurators() = Extensions.getExtensions(KotlinProjectConfigurator.EP_N
fun getCanBeConfiguredModules(project: Project, configurator: KotlinProjectConfigurator): List<Module> { fun getCanBeConfiguredModules(project: Project, configurator: KotlinProjectConfigurator): List<Module> {
return ModuleSourceRootMap(project).groupByBaseModules(project.allModules()) return ModuleSourceRootMap(project).groupByBaseModules(project.allModules())
.filter { configurator.canConfigure(it) } .filter { configurator.canConfigure(it) }
.map { it.baseModule } .map { it.baseModule }
} }
private fun KotlinProjectConfigurator.canConfigure(moduleSourceRootGroup: ModuleSourceRootGroup) = private fun KotlinProjectConfigurator.canConfigure(moduleSourceRootGroup: ModuleSourceRootGroup) =
getStatus(moduleSourceRootGroup) == ConfigureKotlinStatus.CAN_BE_CONFIGURED && getStatus(moduleSourceRootGroup) == ConfigureKotlinStatus.CAN_BE_CONFIGURED &&
(allConfigurators().toList() - this).none { it.getStatus(moduleSourceRootGroup) == ConfigureKotlinStatus.CONFIGURED } (allConfigurators().toList() - this).none { it.getStatus(moduleSourceRootGroup) == ConfigureKotlinStatus.CONFIGURED }
/** /**
* Returns a list of modules which contain sources in Kotlin and for which it's possible to run the given configurator. * Returns a list of modules which contain sources in Kotlin and for which it's possible to run the given configurator.
@@ -238,7 +242,10 @@ fun getConfigurationPossibilitiesForConfigureNotification(
ConfigureKotlinStatus.CONFIGURED -> moduleAlreadyConfigured = true ConfigureKotlinStatus.CONFIGURED -> moduleAlreadyConfigured = true
} }
} }
if (moduleCanBeConfigured && !moduleAlreadyConfigured && !SuppressNotificationState.isKotlinNotConfiguredSuppressed(moduleSourceRootGroup)) if (moduleCanBeConfigured && !moduleAlreadyConfigured && !SuppressNotificationState.isKotlinNotConfiguredSuppressed(
moduleSourceRootGroup
)
)
configurableModules.add(moduleSourceRootGroup) configurableModules.add(moduleSourceRootGroup)
} }
@@ -248,15 +255,15 @@ fun getConfigurationPossibilitiesForConfigureNotification(
fun findApplicableConfigurator(module: Module): KotlinProjectConfigurator { fun findApplicableConfigurator(module: Module): KotlinProjectConfigurator {
val moduleGroup = module.toModuleGroup() val moduleGroup = module.toModuleGroup()
return allConfigurators().find { it.getStatus(moduleGroup) != ConfigureKotlinStatus.NON_APPLICABLE } return allConfigurators().find { it.getStatus(moduleGroup) != ConfigureKotlinStatus.NON_APPLICABLE }
?: KotlinJavaModuleConfigurator.instance ?: KotlinJavaModuleConfigurator.instance
} }
fun hasAnyKotlinRuntimeInScope(module: Module): Boolean { fun hasAnyKotlinRuntimeInScope(module: Module): Boolean {
return runReadAction { return runReadAction {
val scope = module.getModuleWithDependenciesAndLibrariesScope(hasKotlinFilesOnlyInTests(module)) val scope = module.getModuleWithDependenciesAndLibrariesScope(hasKotlinFilesOnlyInTests(module))
getKotlinJvmRuntimeMarkerClass(module.project, scope) != null || getKotlinJvmRuntimeMarkerClass(module.project, scope) != null ||
hasKotlinJsKjsmFile(module.project, LibraryKindSearchScope(module, scope, JSLibraryKind) ) || hasKotlinJsKjsmFile(module.project, LibraryKindSearchScope(module, scope, JSLibraryKind)) ||
hasKotlinCommonRuntimeInScope(scope) hasKotlinCommonRuntimeInScope(scope)
} }
} }
@@ -286,9 +293,10 @@ fun hasKotlinFilesInSources(module: Module): Boolean {
return FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(false)) return FileTypeIndex.containsFileOfType(KotlinFileType.INSTANCE, module.getModuleScope(false))
} }
private class LibraryKindSearchScope(val module: Module, private class LibraryKindSearchScope(
val baseScope: GlobalSearchScope, val module: Module,
val libraryKind: PersistentLibraryKind<*> val baseScope: GlobalSearchScope,
val libraryKind: PersistentLibraryKind<*>
) : DelegatingGlobalSearchScope(baseScope) { ) : DelegatingGlobalSearchScope(baseScope) {
override fun contains(file: VirtualFile): Boolean { override fun contains(file: VirtualFile): Boolean {
if (!super.contains(file)) return false if (!super.contains(file)) return false