MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Kotlin, MPP] KT-18159 Don't report excessive LinkedProjectId errors

Browse Source 
Report missing project ID only for Gradle modules imported with the
External System. Other modules should have no implications for HMPP

GitOrigin-RevId: bff33c1c49fe64ae2e9eb61496c6c599f29ed907
This commit is contained in:
Pavel Kirpichenkov
2021-10-13 12:38:47 +03:00
committed by intellij-monorepo-bot
parent 82f8c5c684
commit bae5bb15a6
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/kotlin/analysis/src/org/jetbrains/kotlin/idea/caches/project/multiplatformUtil.kt
View File

@@ -6,6 +6,7 @@ import com.intellij.facet.FacetManager
import com.intellij.facet.FacetTypeRegistry
import com.intellij.openapi.externalSystem.ExternalSystemModulePropertyManager
import com.intellij.openapi.externalSystem.service.project.IdeModelsProviderImpl
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project
@@ -31,6 +32,7 @@ import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.isCommon
import org.jetbrains.kotlin.platform.konan.NativePlatform
import org.jetbrains.kotlin.platform.konan.NativePlatformUnspecifiedTarget
import org.jetbrains.plugins.gradle.util.GradleConstants
val Module.isNewMPPModule: Boolean
get() = facetSettings?.mppVersion.isNewMPP ||
@@ -86,11 +88,19 @@ val Module.implementingModules: List<Module>
}
}
/**
* Stable module name should match the Gradle name put into Kotlin facet during import.
* The External system can provide the name, but only for modules that were imported from
* a build system under the responsibility of the External system.
* For all other modules their workspace name is used.
* Some tests (e.g. [org.jetbrains.kotlin.idea.codeMetaInfo.AbstractCodeMetaInfoTest]) rely on this.
* These tests set up modules and Kotlin facets manually without involvement of the External system.
*/
private val Module.stableModuleName: String
get() = ExternalSystemModulePropertyManager.getInstance(this).getLinkedProjectId()
?: name.also {
if (!isUnitTestMode()) LOG.error("Don't have a LinkedProjectId for module $this for HMPP!")
}
get() = if (ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, this)) {
ExternalSystemModulePropertyManager.getInstance(this).getLinkedProjectId()
?: name.also { LOG.error("Don't have a LinkedProjectId for module $this for HMPP!") }
} else name
private val Project.modulesByLinkedKey: Map<String, Module>
get() = cacheInvalidatingOnRootModifications {

1
plugins/kotlin/core/kotlin.core.iml
View File

@@ -40,5 +40,6 @@
<orderEntry type="module" module-name="intellij.platform.core.ui" />
<orderEntry type="module" module-name="intellij.platform.codeStyle.impl" />
<orderEntry type="module" module-name="intellij.java.manifest" />
<orderEntry type="module" module-name="intellij.gradle.common" />
</component>
</module>