MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Use GradleConstants.SYSTEM_ID and ProjectDependenciesModels.MAVEN_SYSTEM_ID instead of ProjectSystemId("GRADLE|MAVEN")

Browse Source 
IDEA-353391

GitOrigin-RevId: b454c1a5502529b12d459d2f03ee6bf9e2bcc947
This commit is contained in:
Victoria.Petrakovich
2024-11-19 17:50:12 +00:00
committed by intellij-monorepo-bot
parent 30167194d6
commit 7a0cb0f708
11 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/intellij.java.tests.iml
+1
View File
@@ -89,5 +89,6 @@
<orderEntry type="module" module-name="intellij.platform.navbar.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.unscramble" scope="TEST" />
<orderEntry type="library" scope="TEST" name="ASM" level="project" />
<orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
</component>
</module>
java/java-tests/testSrc/com/intellij/java/codeInsight/navigation/MockGradleRunConfiguration.java
+2 -1
View File
@@ -9,10 +9,11 @@ import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunCo
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.NotNullLazyValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.util.GradleConstants;
public class MockGradleRunConfiguration extends ExternalSystemRunConfiguration {
public MockGradleRunConfiguration(Project project, String name) {
super(new ProjectSystemId("Gradle"), project,
super(new ProjectSystemId(GradleConstants.SYSTEM_ID.getId()), project,
new SimpleConfigurationType(
"GradleRunConfiguration",
"Gradle",
platform/external-system-impl/intellij.platform.externalSystem.tests.iml
+1
View File
@@ -33,5 +33,6 @@
<orderEntry type="module" module-name="intellij.platform.workspace.jps" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.backend.workspace" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.backend.observation" scope="TEST" />
<orderEntry type="module" module-name="intellij.gradle" scope="TEST" />
</component>
</module>
platform/external-system-impl/testSrc/com/intellij/openapi/externalSystem/configurationStore/ExternalSystemStorageTest.kt
+3 -2
View File
@@ -63,6 +63,7 @@ import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import org.assertj.core.api.Assertions.assertThat
import org.jetbrains.jps.model.serialization.SerializationConstants
import org.jetbrains.plugins.gradle.util.GradleConstants
import org.junit.Assert.*
import org.junit.Assume.assumeFalse
import org.junit.Before
@@ -131,7 +132,7 @@ class ExternalSystemStorageTest {
val propertyManager = ExternalSystemModulePropertyManager.getInstance(module)
val systemId = ProjectSystemId("GRADLE")
val systemId = GradleConstants.SYSTEM_ID
val moduleData = ModuleData("test", systemId, "", "", "", projectDir.invariantSeparatorsPathString).also {
it.group = "group"
it.version = "42.0"
@@ -186,7 +187,7 @@ class ExternalSystemStorageTest {
private fun setExternalSystemOptions(module: Module, projectDir: Path) {
val propertyManager = ExternalSystemModulePropertyManager.getInstance(module)
val systemId = ProjectSystemId("GRADLE")
val systemId = GradleConstants.SYSTEM_ID
val moduleData = ModuleData("test", systemId, "", "", "", projectDir.invariantSeparatorsPathString).also {
it.group = "group"
it.version = "42.0"
plugins/gradle/java/intellij.gradle.java.tests.iml
+1
View File
@@ -37,5 +37,6 @@
<orderEntry type="module" module-name="intellij.platform.backend.workspace" scope="TEST" />
<orderEntry type="module" module-name="intellij.platform.workspace.jps" scope="TEST" />
<orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
<orderEntry type="module" module-name="kotlin.base.util" scope="TEST" />
</component>
</module>
plugins/gradle/java/testSources/setup/GradleOpenProjectTestCase.kt
+2 -3
View File
@@ -6,11 +6,11 @@ import com.intellij.ide.actions.ImportProjectAction
import com.intellij.openapi.externalSystem.action.AttachExternalProjectAction
import com.intellij.openapi.externalSystem.autolink.ExternalSystemUnlinkedProjectAware.Companion.EP_NAME
import com.intellij.openapi.externalSystem.autolink.forEachExtensionSafeAsync
import com.intellij.openapi.externalSystem.model.ProjectSystemId
import com.intellij.openapi.externalSystem.util.performAction
import com.intellij.openapi.externalSystem.util.performOpenAction
import com.intellij.openapi.project.Project
import com.intellij.testFramework.utils.vfs.getDirectory
import org.jetbrains.kotlin.idea.base.util.MAVEN_PROJECT_SYSTEM_ID
import org.jetbrains.plugins.gradle.action.ImportProjectFromScriptAction
import org.jetbrains.plugins.gradle.testFramework.GradleTestCase
import org.jetbrains.plugins.gradle.testFramework.util.ProjectInfo
@@ -41,10 +41,9 @@ abstract class GradleOpenProjectTestCase : GradleTestCase() {
}
suspend fun attachMavenProject(project: Project, relativePath: String) {
val mavenSystemId = ProjectSystemId("MAVEN")
val projectPath = testRoot.getDirectory(relativePath).toNioPath().toString()
EP_NAME.forEachExtensionSafeAsync { extension ->
if (extension.systemId == mavenSystemId) {
if (extension.systemId == MAVEN_PROJECT_SYSTEM_ID) {
extension.linkAndLoadProjectAsync(project, projectPath)
}
}
plugins/kotlin/base/util/src/org/jetbrains/kotlin/idea/base/util/ProjectStructureUtils.kt
+8 -1
View File
@@ -176,7 +176,14 @@ private val GRADLE_SYSTEM_ID = ProjectSystemId("GRADLE")
val Module.isGradleModule: Boolean
get() = ExternalSystemApiUtil.isExternalSystemAwareModule(GRADLE_SYSTEM_ID, this)
/*
This constant should be "MAVEN" but changing it breaks the tests:
org.jetbrains.kotlin.idea.maven.MavenUpdateConfigurationQuickFixTest12.testAddKotlinReflect
org.jetbrains.kotlin.idea.maven.MavenKotlinBuildSystemDependencyManagerTest.testMavenDependencyManagerIsApplicable
*/
private val MAVEN_SYSTEM_ID = ProjectSystemId("Maven")
val Module.isMavenModule: Boolean
get() = ExternalSystemApiUtil.isExternalSystemAwareModule(MAVEN_SYSTEM_ID, this)
get() = ExternalSystemApiUtil.isExternalSystemAwareModule(MAVEN_SYSTEM_ID, this)
val MAVEN_PROJECT_SYSTEM_ID: ProjectSystemId = ProjectSystemId("MAVEN")
plugins/kotlin/gradle/code-insight-common/src/org/jetbrains/kotlin/idea/gradleCodeInsightCommon/GradleKotlinBuildSystemDependencyManager.kt
+2 -1
View File
@@ -12,6 +12,7 @@ import org.jetbrains.annotations.ApiStatus
import org.jetbrains.kotlin.idea.base.util.isGradleModule
import org.jetbrains.kotlin.idea.configuration.KotlinBuildSystemDependencyManager
import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurationService
import org.jetbrains.plugins.gradle.util.GradleConstants
@ApiStatus.Internal
class GradleKotlinBuildSystemDependencyManager(private val project: Project) : KotlinBuildSystemDependencyManager {
@@ -28,7 +29,7 @@ class GradleKotlinBuildSystemDependencyManager(private val project: Project) : K
override fun isProjectSyncPending(): Boolean {
val isNotificationVisible =
ExternalSystemProjectNotificationAware.isNotificationVisibleProperty(project, ProjectSystemId("GRADLE", "Gradle"))
ExternalSystemProjectNotificationAware.isNotificationVisibleProperty(project, GradleConstants.SYSTEM_ID)
return isNotificationVisible.get()
}
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt
+1 -1
View File
@@ -4,5 +4,5 @@ package org.jetbrains.kotlin.idea.framework
import com.intellij.openapi.externalSystem.model.ProjectSystemId
val MAVEN_SYSTEM_ID = ProjectSystemId("Maven")
val MAVEN_SYSTEM_ID = ProjectSystemId("MAVEN")
plugins/kotlin/maven/src/org/jetbrains/kotlin/idea/maven/MavenKotlinBuildSystemDependencyManager.kt
+2 -2
View File
@@ -3,7 +3,6 @@ package org.jetbrains.kotlin.idea.maven
import com.intellij.openapi.externalSystem.autoimport.ExternalSystemProjectNotificationAware
import com.intellij.openapi.externalSystem.autoimport.ExternalSystemProjectTracker
import com.intellij.openapi.externalSystem.model.ProjectSystemId
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.DependencyScope
@@ -12,6 +11,7 @@ import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.xml.XmlFile
import org.jetbrains.idea.maven.model.MavenId
import org.jetbrains.idea.maven.utils.MavenArtifactScope
import org.jetbrains.kotlin.idea.base.util.MAVEN_PROJECT_SYSTEM_ID
import org.jetbrains.kotlin.idea.base.util.isMavenModule
import org.jetbrains.kotlin.idea.configuration.KotlinBuildSystemDependencyManager
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
@@ -50,7 +50,7 @@ class MavenKotlinBuildSystemDependencyManager(
override fun isProjectSyncPending(): Boolean {
val isNotificationVisible =
ExternalSystemProjectNotificationAware.isNotificationVisibleProperty(project, ProjectSystemId("MAVEN")).get()
ExternalSystemProjectNotificationAware.isNotificationVisibleProperty(project, MAVEN_PROJECT_SYSTEM_ID).get()
return isNotificationVisible
}
plugins/kotlin/project-configuration/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt
+8 -6
View File
@@ -64,6 +64,7 @@ import org.jetbrains.kotlin.platform.isJs
import org.jetbrains.kotlin.platform.isWasm
import org.jetbrains.kotlin.platform.jvm.isJvm
import org.jetbrains.kotlin.platform.konan.isNative
import org.jetbrains.plugins.gradle.util.GradleConstants
import java.nio.file.Path
import java.util.*
import kotlin.io.path.Path
@@ -586,12 +587,13 @@ fun getTargetBytecodeVersionFromModule(
): String? {
val projectPath = ExternalSystemApiUtil.getExternalProjectPath(module) ?: return null
val project = module.project
return ExternalSystemApiUtil.findModuleNode(project, ProjectSystemId("GRADLE"), projectPath)?.let { moduleDataNode ->
val javaModuleData = ExternalSystemApiUtil.find(moduleDataNode, JavaModuleData.KEY)
javaModuleData?.let {
javaModuleData.data.targetBytecodeVersion
}
} ?: getJvmTargetFromSdkOrDefault(module, kotlinVersion)
return ExternalSystemApiUtil.findModuleNode(project, GradleConstants.SYSTEM_ID, projectPath)
?.let { moduleDataNode ->
val javaModuleData = ExternalSystemApiUtil.find(moduleDataNode, JavaModuleData.KEY)
javaModuleData?.let {
javaModuleData.data.targetBytecodeVersion
}
} ?: getJvmTargetFromSdkOrDefault(module, kotlinVersion)
}
private fun getJvmTargetFromSdkOrDefault(