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

Use ModuleOrderEntry instead of ModuleOrderEntryImpl

Browse Source 
`isProductionOnTestDependency` function was moved from implementation to
interface. The fix is important for the new IJ project model.
This commit is contained in:
Alex Plate
2020-02-19 14:35:37 +03:00
committed by Nikita Bobko
parent bc20464bad
commit 801c97f456
5 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/IdeaModuleInfos.kt
+2 -3
View File
@@ -11,7 +11,6 @@ import com.intellij.openapi.module.impl.scopes.LibraryScopeBase
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.* import com.intellij.openapi.roots.*
import com.intellij.openapi.roots.impl.ModuleOrderEntryImpl
import com.intellij.openapi.roots.impl.libraries.LibraryEx import com.intellij.openapi.roots.impl.libraries.LibraryEx
import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.roots.libraries.Library
import com.intellij.openapi.util.ModificationTracker import com.intellij.openapi.util.ModificationTracker
@@ -92,7 +91,7 @@ private fun orderEntryToModuleInfo(project: Project, orderEntry: OrderEntry, for
} }
is ModuleOrderEntry -> { is ModuleOrderEntry -> {
val module = orderEntry.module ?: return emptyList() val module = orderEntry.module ?: return emptyList()
if (forProduction && orderEntry is ModuleOrderEntryImpl && orderEntry.isProductionOnTestDependency) { if (forProduction && orderEntry.isProductionOnTestDependency) {
listOfNotNull(module.testSourceInfo()) listOfNotNull(module.testSourceInfo())
} else { } else {
module.toInfos() module.toInfos()
@@ -131,7 +130,7 @@ private fun OrderEntry.acceptAsDependency(forProduction: Boolean): Boolean {
return this !is ExportableOrderEntry return this !is ExportableOrderEntry
|| !forProduction || !forProduction
// this is needed for Maven/Gradle projects with "production-on-test" dependency // this is needed for Maven/Gradle projects with "production-on-test" dependency
|| this is ModuleOrderEntryImpl && isProductionOnTestDependency || this is ModuleOrderEntry && isProductionOnTestDependency
|| scope.isForProductionCompile || scope.isForProductionCompile
} }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/KotlinJavaMPPSourceSetDataService.kt
+1 -2
View File
@@ -15,7 +15,6 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.LibraryOrderEntry
import com.intellij.openapi.roots.ModuleOrderEntry import com.intellij.openapi.roots.ModuleOrderEntry
import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.roots.impl.ModuleOrderEntryImpl
import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VfsUtil
import org.jetbrains.kotlin.idea.configuration.KotlinTargetData import org.jetbrains.kotlin.idea.configuration.KotlinTargetData
import org.jetbrains.kotlin.idea.configuration.kotlinSourceSet import org.jetbrains.kotlin.idea.configuration.kotlinSourceSet
@@ -48,7 +47,7 @@ class KotlinJavaMPPSourceSetDataService : AbstractProjectDataService<GradleSourc
val moduleEntries = rootModel.orderEntries.filterIsInstance<ModuleOrderEntry>() val moduleEntries = rootModel.orderEntries.filterIsInstance<ModuleOrderEntry>()
moduleEntries.filter { isTestModuleById(it.moduleName, toImport) }.forEach { moduleOrderEntry -> moduleEntries.filter { isTestModuleById(it.moduleName, toImport) }.forEach { moduleOrderEntry ->
(moduleOrderEntry as? ModuleOrderEntryImpl)?.isProductionOnTestDependency = true moduleOrderEntry.isProductionOnTestDependency = true
} }
val libraryEntries = rootModel.orderEntries.filterIsInstance<LibraryOrderEntry>() val libraryEntries = rootModel.orderEntries.filterIsInstance<LibraryOrderEntry>()
libraryEntries.forEach { libraryEntry -> libraryEntries.forEach { libraryEntry ->
idea/idea-gradle/src/org/jetbrains/kotlin/idea/utils.kt
+3 -4
View File
@@ -5,11 +5,10 @@
package org.jetbrains.kotlin.idea package org.jetbrains.kotlin.idea
import com.intellij.openapi.diagnostic.Logger
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.roots.DependencyScope import com.intellij.openapi.roots.DependencyScope
import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.impl.ModuleOrderEntryImpl
import com.intellij.openapi.diagnostic.Logger
/** /**
* Returns the dependency scope which has flags specific to the both provided scopes * Returns the dependency scope which has flags specific to the both provided scopes
@@ -57,7 +56,7 @@ fun addModuleDependencyIfNeeded(
dependOnTest: Boolean dependOnTest: Boolean
) { ) {
val existingEntry = rootModel.findModuleOrderEntry(dependeeModule) val existingEntry = rootModel.findModuleOrderEntry(dependeeModule)
val existingDependOnTest = (existingEntry as? ModuleOrderEntryImpl)?.isProductionOnTestDependency ?: false val existingDependOnTest = existingEntry?.isProductionOnTestDependency ?: false
val requiredScope = getScopeContainingBoth(if (testScope) DependencyScope.TEST else DependencyScope.COMPILE, existingEntry?.scope) val requiredScope = getScopeContainingBoth(if (testScope) DependencyScope.TEST else DependencyScope.COMPILE, existingEntry?.scope)
if (existingEntry != null) { if (existingEntry != null) {
@@ -72,6 +71,6 @@ fun addModuleDependencyIfNeeded(
} }
rootModel.addModuleOrderEntry(dependeeModule).also { rootModel.addModuleOrderEntry(dependeeModule).also {
it.scope = requiredScope it.scope = requiredScope
(it as? ModuleOrderEntryImpl)?.isProductionOnTestDependency = dependOnTest || existingDependOnTest it.isProductionOnTestDependency = dependOnTest || existingDependOnTest
} }
} }
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/MultiplatformProjectImportingTest.kt
+2 -2
View File
@@ -18,8 +18,8 @@ package org.jetbrains.kotlin.gradle
import com.intellij.openapi.roots.DependencyScope import com.intellij.openapi.roots.DependencyScope
import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.LibraryOrderEntry
import com.intellij.openapi.roots.ModuleOrderEntry
import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.roots.impl.ModuleOrderEntryImpl
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.util.PathUtil import com.intellij.util.PathUtil
import junit.framework.TestCase import junit.framework.TestCase
@@ -43,7 +43,7 @@ class MultiplatformProjectImportingTest : MultiplePluginVersionGradleImportingTe
val depOrderEntry = getModule(moduleName) val depOrderEntry = getModule(moduleName)
.rootManager .rootManager
.orderEntries .orderEntries
.filterIsInstance<ModuleOrderEntryImpl>() .filterIsInstance<ModuleOrderEntry>()
.first { it.moduleName == depModuleName } .first { it.moduleName == depModuleName }
assert(depOrderEntry.isProductionOnTestDependency == expected) assert(depOrderEntry.isProductionOnTestDependency == expected)
} }
idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/projectStructureDSL.kt
+1 -2
View File
@@ -10,7 +10,6 @@ import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.project.rootManager import com.intellij.openapi.project.rootManager
import com.intellij.openapi.roots.* import com.intellij.openapi.roots.*
import com.intellij.openapi.roots.impl.ModuleOrderEntryImpl
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.jps.model.module.JpsModuleSourceRootType import org.jetbrains.jps.model.module.JpsModuleSourceRootType
import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.jps.util.JpsPathUtil
@@ -319,7 +318,7 @@ class ModuleInfo(
private fun checkProductionOnTest(library: ExportableOrderEntry, productionOnTest: Boolean?) { private fun checkProductionOnTest(library: ExportableOrderEntry, productionOnTest: Boolean?) {
if (productionOnTest == null) return if (productionOnTest == null) return
val actualFlag = (library as? ModuleOrderEntryImpl)?.isProductionOnTestDependency val actualFlag = (library as? ModuleOrderEntry)?.isProductionOnTestDependency
if (actualFlag == null) { if (actualFlag == null) {
projectInfo.messageCollector.report( projectInfo.messageCollector.report(
"Module '${module.name}': Dependency '${library.presentableName}' has no productionOnTest property" "Module '${module.name}': Dependency '${library.presentableName}' has no productionOnTest property"