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

Improve performance of import in Android Studio

Browse Source 
Improve performance of dependency tree calculation when module per
source set mode is disabled.
#KT-34663 Fixed
This commit is contained in:
Andrey Uskov
2019-10-23 19:54:25 +03:00
parent e8e04ca98e
commit 5c3b00cd0c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleProjectResolverExtension.kt
+9 -4
View File
@@ -144,6 +144,7 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
ExternalSystemApiUtil.findAll(ideModule, GradleSourceSetData.KEY) ExternalSystemApiUtil.findAll(ideModule, GradleSourceSetData.KEY)
} else listOf(ideModule) } else listOf(ideModule)
var dirtyDependencies = true
for (currentModuleNode in moduleNodesToProcess) { for (currentModuleNode in moduleNodesToProcess) {
val toProcess = ArrayDeque<DataNode<out ModuleData>>().apply { add(currentModuleNode) } val toProcess = ArrayDeque<DataNode<out ModuleData>>().apply { add(currentModuleNode) }
val discovered = HashSet<DataNode<out ModuleData>>().apply { add(currentModuleNode) } val discovered = HashSet<DataNode<out ModuleData>>().apply { add(currentModuleNode) }
@@ -178,14 +179,18 @@ class KotlinGradleProjectResolverExtension : AbstractProjectResolverExtension()
addDependency(currentModuleNode, targetMainSourceSet) addDependency(currentModuleNode, targetMainSourceSet)
} }
} else { } else {
dirtyDependencies = true
addDependency(currentModuleNode, targetModule) addDependency(currentModuleNode, targetModule)
} }
} }
val dependencies = if (useModulePerSourceSet()) moduleNode.getDependencies(ideProject) else getDependencyModules( val dependencies = if (useModulePerSourceSet()) {
ideModule, moduleNode.getDependencies(ideProject)
gradleModule.project } else {
) if (dirtyDependencies) getDependencyModules(ideModule, gradleModule.project).also {
dirtyDependencies = false
} else emptyList()
}
// queue only those dependencies that haven't been discovered earlier // queue only those dependencies that haven't been discovered earlier
dependencies.filterTo(toProcess, discovered::add) dependencies.filterTo(toProcess, discovered::add)
} }