From ab72460f281069422df4498c06d793add33bb1f8 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 12 Dec 2016 20:16:19 +0300
Subject: [PATCH] Rename: allDependentModules --> allDependencyModules

---
 .../kotlin/resolve/lazy/DefaultImportProvider.kt       |  6 +++---
 .../jetbrains/kotlin/descriptors/ModuleDescriptor.kt   |  5 +++--
 .../kotlin/descriptors/impl/ModuleDescriptorImpl.kt    | 10 +++++-----
 .../src/org/jetbrains/kotlin/types/ErrorUtils.java     |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DefaultImportProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DefaultImportProvider.kt
index a8da62aabb3..0e4d2d945c1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DefaultImportProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DefaultImportProvider.kt
@@ -43,9 +43,9 @@ class DefaultImportProvider(
 
     val excludedImports: List<FqName> by storageManager.createLazyValue {
         val packagesWithAliases = listOf(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME, KotlinBuiltIns.TEXT_PACKAGE_FQ_NAME)
-        val builtinTypeAliases = moduleDescriptor.allDependentModules
-                .flatMap { dependentModule ->
-                    packagesWithAliases.map(dependentModule::getPackage).flatMap {
+        val builtinTypeAliases = moduleDescriptor.allDependencyModules
+                .flatMap { dependencyModule ->
+                    packagesWithAliases.map(dependencyModule::getPackage).flatMap {
                         it.memberScope.getContributedDescriptors(DescriptorKindFilter.TYPE_ALIASES).filterIsInstance<TypeAliasDescriptor>()
                     }
                 }
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt
index c5257d74fd5..5ee8f86917a 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt
@@ -45,10 +45,11 @@ interface ModuleDescriptor : DeclarationDescriptor {
     fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection<FqName>
 
     /**
-     * @return dependent modules in the same order in which this module depends on them. Does not include `this`
+     * @return dependency modules in the same order in which this module depends on them. Does not include `this`
      */
-    val allDependentModules: List<ModuleDescriptor>
+    val allDependencyModules: List<ModuleDescriptor>
 
+    // All platform-specific modules depending on common 'this' module (result is empty if this is platform-specific itself)
     val allImplementingModules: Set<ModuleDescriptor>
 
     fun <T> getCapability(capability: Capability<T>): T?
diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
index 6055ff92b63..9bcd2db088f 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
+++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt
@@ -49,7 +49,7 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
     @Deprecated("This method is not going to be supported. Please do not use it")
     val testOnly_AllDependentModules: List<ModuleDescriptorImpl> get() = this.dependencies!!.allDependencies
 
-    override val allDependentModules: List<ModuleDescriptor>
+    override val allDependencyModules: List<ModuleDescriptor>
         get() = this.dependencies.sure { "Dependencies of module $id were not set" }.allDependencies.filter { it != this }
 
     override val allImplementingModules: MutableSet<ModuleDescriptor> = mutableSetOf()
@@ -82,10 +82,10 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
         assert(this.dependencies == null) { "Dependencies of $id were already set" }
         this.dependencies = dependencies
         if (platformKind == PlatformKind.DEFAULT) return
-        for (dependentModule in allDependentModules) {
-            if (dependentModule.platformKind != PlatformKind.DEFAULT) continue
-            if (dependentModule.sourceKind != sourceKind) continue
-            (dependentModule as? ModuleDescriptorImpl)?.allImplementingModules?.add(this)
+        for (dependencyModule in allDependencyModules) {
+            if (dependencyModule.platformKind != PlatformKind.DEFAULT) continue
+            if (dependencyModule.sourceKind != sourceKind) continue
+            (dependencyModule as? ModuleDescriptorImpl)?.allImplementingModules?.add(this)
         }
     }
 
diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
index ae9c35fb548..afd2bc3828b 100644
--- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
@@ -94,7 +94,7 @@ public class ErrorUtils {
 
             @NotNull
             @Override
-            public List<ModuleDescriptor> getAllDependentModules() {
+            public List<ModuleDescriptor> getAllDependencyModules() {
                 return emptyList();
             }