From 7c96124a382d1f39de608674ccf92a8e83c72150 Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Mon, 19 Dec 2022 21:35:16 +0100 Subject: [PATCH] [LL FIR] KT-55329 Rename `refinementDependency` to `dependsOnDependency` - The new Kotlin MPP name for `refinementDependency` is `dependsOnDependency`. --- ...Fe10SymbolContainingDeclarationProvider.kt | 2 +- .../builder/KtLibraryModuleBuilder.kt | 2 +- .../builder/KtLibrarySourceModuleBuilder.kt | 2 +- .../structure/builder/KtModuleBuilder.kt | 6 +-- .../structure/builder/KtSdkModuleBuilder.kt | 2 +- .../builder/KtSourceModuleBuilder.kt | 2 +- .../structure/impl/KtLibraryModuleImpl.kt | 2 +- .../impl/KtLibrarySourceModuleImpl.kt | 2 +- .../impl/KtNotUnderContentRootModuleImpl.kt | 2 +- .../project/structure/impl/KtSdkModuleImpl.kt | 2 +- .../structure/impl/KtSourceModuleImpl.kt | 2 +- .../KtSourceModuleByCompilerConfiguration.kt | 4 +- .../project/structure/KtSourceModuleImpl.kt | 10 ++-- .../structure/TestModuleStructureFactory.kt | 2 +- .../fir/project/structure/LLFirModuleData.kt | 4 +- ...sApiFirOutOfContentRootTestConfigurator.kt | 2 +- .../analysis/project/structure/KtModule.kt | 53 ++++++++++--------- .../project/structure/ktModuleUtils.kt | 24 ++++----- 18 files changed, 62 insertions(+), 63 deletions(-) diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt index 43dde887fef..5e6eaf5f864 100644 --- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt +++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10SymbolContainingDeclarationProvider.kt @@ -71,7 +71,7 @@ internal class KtFe10SymbolContainingDeclarationProvider( override val librarySources: KtLibrarySourceModule? = null override fun getBinaryRoots(): Collection = listOf(libraryPath) override val directRegularDependencies: List = emptyList() - override val directRefinementDependencies: List = emptyList() + override val directDependsOnDependencies: List = emptyList() override val directFriendDependencies: List = emptyList() override val contentScope: GlobalSearchScope = ProjectScope.getLibrariesScope(project) override val platform: TargetPlatform diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibraryModuleBuilder.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibraryModuleBuilder.kt index 07802bb2563..7dbf80130ad 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibraryModuleBuilder.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibraryModuleBuilder.kt @@ -20,7 +20,7 @@ public class KtLibraryModuleBuilder : KtBinaryModuleBuilder() { override fun build(): KtLibraryModule { return KtLibraryModuleImpl( directRegularDependencies, - directRefinementDependencies, + directDependsOnDependencies, directFriendDependencies, contentScope, platform, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibrarySourceModuleBuilder.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibrarySourceModuleBuilder.kt index 968592b12c7..4fdbc05812c 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibrarySourceModuleBuilder.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtLibrarySourceModuleBuilder.kt @@ -20,7 +20,7 @@ public class KtLibrarySourceModuleBuilder : KtModuleBuilder() { override fun build(): KtLibrarySourceModule { return KtLibrarySourceModuleImpl( directRegularDependencies, - directRefinementDependencies, + directDependsOnDependencies, directFriendDependencies, contentScope, platform, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtModuleBuilder.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtModuleBuilder.kt index a16d1b889b3..d8a66830432 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtModuleBuilder.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtModuleBuilder.kt @@ -13,15 +13,15 @@ import org.jetbrains.kotlin.platform.TargetPlatform @KtModuleBuilderDsl public abstract class KtModuleBuilder { protected val directRegularDependencies: MutableList = mutableListOf() - protected val directRefinementDependencies: MutableList = mutableListOf() + protected val directDependsOnDependencies: MutableList = mutableListOf() protected val directFriendDependencies: MutableList = mutableListOf() public fun addRegularDependency(module: KtModule) { directRegularDependencies.add(module) } - public fun addRefinementDependency(module: KtModule) { - directRefinementDependencies.add(module) + public fun addDependsOnDependency(module: KtModule) { + directDependsOnDependencies.add(module) } public fun addFriendDependency(module: KtModule) { diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSdkModuleBuilder.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSdkModuleBuilder.kt index aa3f6b6ff95..e4ac344dc7d 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSdkModuleBuilder.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSdkModuleBuilder.kt @@ -18,7 +18,7 @@ public class KtSdkModuleBuilder : KtBinaryModuleBuilder() { override fun build(): KtSdkModule { return KtSdkModuleImpl( directRegularDependencies, - directRefinementDependencies, + directDependsOnDependencies, directFriendDependencies, contentScope, platform, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSourceModuleBuilder.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSourceModuleBuilder.kt index 22df08bea4a..6a7c7ad1765 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSourceModuleBuilder.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/builder/KtSourceModuleBuilder.kt @@ -34,7 +34,7 @@ public class KtSourceModuleBuilder : KtModuleBuilder() { override fun build(): KtSourceModule { return KtSourceModuleImpl( directRegularDependencies, - directRefinementDependencies, + directDependsOnDependencies, directFriendDependencies, contentScope, platform, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibraryModuleImpl.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibraryModuleImpl.kt index e212c0d577a..a158551ee31 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibraryModuleImpl.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibraryModuleImpl.kt @@ -16,7 +16,7 @@ import java.nio.file.Path internal class KtLibraryModuleImpl( override val directRegularDependencies: List, - override val directRefinementDependencies: List, + override val directDependsOnDependencies: List, override val directFriendDependencies: List, override val contentScope: GlobalSearchScope, override val platform: TargetPlatform, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibrarySourceModuleImpl.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibrarySourceModuleImpl.kt index 7cbcef157a3..2dca9c9df20 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibrarySourceModuleImpl.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtLibrarySourceModuleImpl.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices internal class KtLibrarySourceModuleImpl( override val directRegularDependencies: List, - override val directRefinementDependencies: List, + override val directDependsOnDependencies: List, override val directFriendDependencies: List, override val contentScope: GlobalSearchScope, override val platform: TargetPlatform, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtNotUnderContentRootModuleImpl.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtNotUnderContentRootModuleImpl.kt index 6b2328bef7b..d5c8b49b285 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtNotUnderContentRootModuleImpl.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtNotUnderContentRootModuleImpl.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices internal class KtNotUnderContentRootModuleImpl( override val name: String, override val directRegularDependencies: List = emptyList(), - override val directRefinementDependencies: List = emptyList(), + override val directDependsOnDependencies: List = emptyList(), override val directFriendDependencies: List = emptyList(), override val platform: TargetPlatform = JvmPlatforms.defaultJvmPlatform, override val file: PsiFile? = null, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSdkModuleImpl.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSdkModuleImpl.kt index d21d4ef2d6e..45f859187d0 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSdkModuleImpl.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSdkModuleImpl.kt @@ -15,7 +15,7 @@ import java.nio.file.Path internal class KtSdkModuleImpl( override val directRegularDependencies: List, - override val directRefinementDependencies: List, + override val directDependsOnDependencies: List, override val directFriendDependencies: List, override val contentScope: GlobalSearchScope, override val platform: TargetPlatform, diff --git a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSourceModuleImpl.kt b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSourceModuleImpl.kt index 4e928f87fee..8bd4469e6a9 100644 --- a/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSourceModuleImpl.kt +++ b/analysis/analysis-api-standalone/src/org/jetbrains/kotlin/analysis/project/structure/impl/KtSourceModuleImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices internal class KtSourceModuleImpl( override val directRegularDependencies: List, - override val directRefinementDependencies: List, + override val directDependsOnDependencies: List, override val directFriendDependencies: List, override val contentScope: GlobalSearchScope, override val platform: TargetPlatform, diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleByCompilerConfiguration.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleByCompilerConfiguration.kt index 4bff1afcc75..633e4bf549d 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleByCompilerConfiguration.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleByCompilerConfiguration.kt @@ -55,7 +55,7 @@ abstract class KtModuleByCompilerConfiguration( } } - val directRefinementDependencies: List by lazy(LazyThreadSafetyMode.PUBLICATION) { + val directDependsOnDependencies: List by lazy(LazyThreadSafetyMode.PUBLICATION) { testModule.dependsOnDependencies .map { moduleProvider.getModule(it.moduleName) } } @@ -139,7 +139,7 @@ private class LibraryByRoots( ) : KtLibraryModule { override val libraryName: String get() = "Test Library" override val directRegularDependencies: List get() = emptyList() - override val directRefinementDependencies: List get() = emptyList() + override val directDependsOnDependencies: List get() = emptyList() override val directFriendDependencies: List get() = emptyList() override val contentScope: GlobalSearchScope get() = ProjectScope.getLibrariesScope(project) override val platform: TargetPlatform get() = module.platform diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleImpl.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleImpl.kt index 466d592a1ec..3ede9c03432 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleImpl.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/KtSourceModuleImpl.kt @@ -16,7 +16,7 @@ import java.nio.file.Path interface KtModuleWithModifiableDependencies { val directRegularDependencies: MutableList - val directRefinementDependencies: MutableList + val directDependsOnDependencies: MutableList val directFriendDependencies: MutableList } @@ -30,7 +30,7 @@ class KtSourceModuleImpl( override val analyzerServices: PlatformDependentAnalyzerServices get() = platform.getAnalyzerServices() override val directRegularDependencies: MutableList = mutableListOf() - override val directRefinementDependencies: MutableList = mutableListOf() + override val directDependsOnDependencies: MutableList = mutableListOf() override val directFriendDependencies: MutableList = mutableListOf() } @@ -47,7 +47,7 @@ class KtJdkModuleImpl( override fun getBinaryRoots(): Collection = binaryRoots override val directRegularDependencies: MutableList = mutableListOf() - override val directRefinementDependencies: MutableList = mutableListOf() + override val directDependsOnDependencies: MutableList = mutableListOf() override val directFriendDependencies: MutableList = mutableListOf() } @@ -63,7 +63,7 @@ class KtLibraryModuleImpl( override fun getBinaryRoots(): Collection = binaryRoots override val directRegularDependencies: MutableList = mutableListOf() - override val directRefinementDependencies: MutableList = mutableListOf() + override val directDependsOnDependencies: MutableList = mutableListOf() override val directFriendDependencies: MutableList = mutableListOf() } @@ -77,6 +77,6 @@ class KtLibrarySourceModuleImpl( override val analyzerServices: PlatformDependentAnalyzerServices get() = platform.getAnalyzerServices() override val directRegularDependencies: MutableList = mutableListOf() - override val directRefinementDependencies: MutableList = mutableListOf() + override val directDependsOnDependencies: MutableList = mutableListOf() override val directFriendDependencies: MutableList = mutableListOf() } \ No newline at end of file diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestModuleStructureFactory.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestModuleStructureFactory.kt index d0e5bc6edb9..12d00d3b2a3 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestModuleStructureFactory.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/project/structure/TestModuleStructureFactory.kt @@ -94,7 +94,7 @@ object TestModuleStructureFactory { when (dependency.relation) { DependencyRelation.RegularDependency -> ktModule.directRegularDependencies.add(dependencyKtModule) DependencyRelation.FriendDependency -> ktModule.directFriendDependencies.add(dependencyKtModule) - DependencyRelation.DependsOnDependency -> ktModule.directRefinementDependencies.add(dependencyKtModule) + DependencyRelation.DependsOnDependency -> ktModule.directDependsOnDependencies.add(dependencyKtModule) } } } diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirModuleData.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirModuleData.kt index a78287c0e6e..0746df7bb70 100644 --- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirModuleData.kt +++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/project/structure/LLFirModuleData.kt @@ -6,8 +6,8 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure import org.jetbrains.kotlin.analysis.project.structure.KtModule -import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirElementWithResolvePhase +import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.moduleData import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol @@ -40,7 +40,7 @@ class LLFirModuleData( } override val dependsOnDependencies: List by lazy(LazyThreadSafetyMode.PUBLICATION) { - ktModule.directRefinementDependencies.map(::LLFirModuleData) + ktModule.directDependsOnDependencies.map(::LLFirModuleData) } override val friendDependencies: List by lazy(LazyThreadSafetyMode.PUBLICATION) { diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt index a5c8bfc8afe..2762df4f71d 100644 --- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt +++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/test/configurators/AnalysisApiFirOutOfContentRootTestConfigurator.kt @@ -76,7 +76,7 @@ private class KtNotUnderContentRootModuleForTest( listOf(builtinsModule) } - override val directRefinementDependencies: List + override val directDependsOnDependencies: List get() = emptyList() override val directFriendDependencies: List diff --git a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModule.kt b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModule.kt index 7c014d19d6e..54a3d979e93 100644 --- a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModule.kt +++ b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/KtModule.kt @@ -22,27 +22,27 @@ import java.nio.file.Path */ public sealed interface KtModule { /** - * A list of Regular dependencies. Regular dependency allows current module to see symbols from dependent module. - * In a case for a source set, it can be other source set it depends on, library, or SDK. + * A list of Regular dependencies. Regular dependency allows the current module to see symbols from the dependent module. In the case + * of a source set, it can be either the source set it depends on, a library, or an SDK. * - * The dependencies list is non-transitive and should not include current module. + * The dependencies list is non-transitive and should not include the current module. */ public val directRegularDependencies: List /** - * Only for Kotlin MPP project. - * A list of Refinement dependencies. - * Refinement dependency express that the current module can provide actual declarations for expect declarations from dependent module, - * as well as see internal symbols of dependent module. + * A list of `dependsOn` dependencies. (Kotlin MPP projects only.) * - * The dependencies list is non-transitive and should not include current module. + * A `dependsOn` dependency expresses that the current module can provide `actual` declarations for `expect` declarations from the + * dependent module, as well as see internal symbols of the dependent module. + * + * `dependsOn` dependencies are transitive, but the list is not a transitive closure. The list should not include the current module. */ - public val directRefinementDependencies: List + public val directDependsOnDependencies: List /** - * A list of Friend dependencies. Friend dependencies express that current module may see internal symbols of dependent module. + * A list of Friend dependencies. Friend dependencies express that the current module may see internal symbols of the dependent module. * - * The dependencies list is non-transitive and should not include current module. + * The dependencies list is non-transitive and should not include the current module. */ public val directFriendDependencies: List @@ -54,7 +54,7 @@ public sealed interface KtModule { public val contentScope: GlobalSearchScope /** - * A platform (e.g, JVM, JS, Native) current module represents. + * A platform (e.g, JVM, JS, Native) which the current module represents. * * @see [TargetPlatform] */ @@ -63,19 +63,20 @@ public sealed interface KtModule { public val analyzerServices: PlatformDependentAnalyzerServices /** - * [Project] to which module belongs. - * If current module depends on some other modules, all those modules should have the same [Project] as the current one. + * [Project] to which the current module belongs. + * + * If the current module depends on some other modules, all those modules should have the same [Project] as the current one. */ public val project: Project /** - * Human-readable description of the module. E.g, "main sources of module 'analysis-api'" + * A human-readable description of the current module. E.g, "main sources of module 'analysis-api'". */ public val moduleDescription: String } /** - * A module which consists of a set of source declarations inside a projects. + * A module which consists of a set of source declarations inside a project. * * Generally, a main or test Source Set. */ @@ -97,8 +98,8 @@ public interface KtSourceModule : KtModule { public sealed interface KtBinaryModule : KtModule { /** * A list of binary files which forms a binary module. It can be a list of JARs, KLIBs, folders with .class files. - * Should be consistent with [contentScope], - * so (pseudo-Kotlin) ` + * + * It should be consistent with [contentScope], so (pseudo-Kotlin): * ``` * library.contentScope.contains(file) <=> library.getBinaryRoots().listRecursively().contains(file) * ``` @@ -107,7 +108,7 @@ public sealed interface KtBinaryModule : KtModule { } /** - * A module which represents a binary library. E.g, JAR or KLIB. + * A module which represents a binary library, e.g. JAR or KLIB. */ public interface KtLibraryModule : KtBinaryModule { public val libraryName: String @@ -122,7 +123,7 @@ public interface KtLibraryModule : KtBinaryModule { } /** - * A module which represent some SDK. E.g, Java JDK. + * A module which represent some SDK, e.g. Java JDK. */ public interface KtSdkModule : KtBinaryModule { public val sdkName: String @@ -132,14 +133,14 @@ public interface KtSdkModule : KtBinaryModule { } /** - * A sources for some [KtLibraryModule] + * Sources for some [KtLibraryModule]. */ public interface KtLibrarySourceModule : KtModule { public val libraryName: String /** * A library binary corresponding to the current library source. - * If current module is a source JAR, then [binaryLibrary] is corresponds to the binaries JAR. + * If the current module is a source JAR, then [binaryLibrary] corresponds to the binaries JAR. */ public val binaryLibrary: KtLibraryModule @@ -148,8 +149,8 @@ public interface KtLibrarySourceModule : KtModule { } /** - * Module which contains kotlin [builtins](https://kotlinlang.org/spec/built-in-types-and-their-semantics.html) for specific platform - * Kotlin builtins are usually reside in the compiler, so [contentScope] and [getBinaryRoots] are empty + * A module which contains kotlin [builtins](https://kotlinlang.org/spec/built-in-types-and-their-semantics.html) for a specific platform. + * Kotlin builtins usually reside in the compiler, so [contentScope] and [getBinaryRoots] are empty. */ public class KtBuiltinsModule( override val platform: TargetPlatform, @@ -157,7 +158,7 @@ public class KtBuiltinsModule( override val project: Project ) : KtBinaryModule { override val directRegularDependencies: List get() = emptyList() - override val directRefinementDependencies: List get() = emptyList() + override val directDependsOnDependencies: List get() = emptyList() override val directFriendDependencies: List get() = emptyList() override val contentScope: GlobalSearchScope get() = GlobalSearchScope.EMPTY_SCOPE override fun getBinaryRoots(): Collection = emptyList() @@ -169,7 +170,7 @@ public class KtBuiltinsModule( /** - * A set of sources which lives outside project content root. E.g, testdata files or source files of some other project. + * A set of sources which live outside the project content root. E.g, testdata files or source files of some other project. */ public interface KtNotUnderContentRootModule : KtModule { /** diff --git a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ktModuleUtils.kt b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ktModuleUtils.kt index 7b06a21a565..d007a57c750 100644 --- a/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ktModuleUtils.kt +++ b/analysis/project-structure/src/org/jetbrains/kotlin/analysis/project/structure/ktModuleUtils.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.analysis.project.structure /** - * A list of all modules current module can depend on with regular dependency + * A list of all modules that the current module can depend on with regular dependency. * * @see KtModule.directRegularDependencies */ @@ -14,7 +14,7 @@ public inline fun KtModule.directRegularDependenciesOfTyp directRegularDependencies.asSequence().filterIsInstance() /** - * A list of all modules current module can depend on with friend dependency + * A list of all modules that the current module can depend on with friend dependency. * * @see KtModule.directFriendDependencies */ @@ -22,34 +22,32 @@ public inline fun KtModule.directFriendDependenciesOfType directFriendDependencies.asSequence().filterIsInstance() /** - * A list of all modules current module can depend on with refinement dependency + * A list of all modules that the current module can depend on with refinement dependency. * - * @see KtModule.directRefinementDependencies + * @see KtModule.directDependsOnDependencies */ -public inline fun KtModule.directRefinementDependenciesOfType(): Sequence = - directRefinementDependencies.asSequence().filterIsInstance() - - +public inline fun KtModule.directDependsOnDependenciesOfType(): Sequence = + directDependsOnDependencies.asSequence().filterIsInstance() /** - * A list of all other modules current module can depend on. + * A list of all other modules that the current module can depend on. * * @see KtModule.directRegularDependencies - * @see KtModule.directRefinementDependencies + * @see KtModule.directDependsOnDependencies * @see KtModule.directFriendDependencies */ public fun KtModule.allDirectDependencies(): Sequence = sequence { yieldAll(directRegularDependencies) - yieldAll(directRefinementDependencies) + yieldAll(directDependsOnDependencies) yieldAll(directFriendDependencies) } /** - * A list of all other modules of type [M] current module can depend on. + * A list of all other modules of type [M] that the current module can depend on. * * @see KtModule.directRegularDependencies - * @see KtModule.directRefinementDependencies + * @see KtModule.directDependsOnDependencies * @see KtModule.directFriendDependencies */ public inline fun KtModule.allDirectDependenciesOfType(): Sequence =