From 7dd7a3271ea9f7edd14d9605b486e3f010e43ac5 Mon Sep 17 00:00:00 2001 From: Nikolay Chashnikov Date: Fri, 4 Jul 2025 11:13:00 +0200 Subject: [PATCH] [java] get rid of usages of deprecated StdModuleTypes (IDEA-375460) GitOrigin-RevId: 94b9310bbc1bae6bdef47fae0f083aa45b6b5820 --- .../UpdateArtifactsAfterRenameTest.java | 2 +- .../projectWizard/ProjectWizardJdkComboBox.kt | 3 +- .../starters/local/StarterModuleBuilder.kt | 5 +-- .../ultimatepromo/PromoSpringModuleBuilder.kt | 4 +- .../util/importProject/JavaModuleInsight.java | 4 +- .../classpath/AddModuleDependencyAction.java | 4 +- .../facet/mock/MockFacetEditorFacade.java | 4 +- .../FrameworkDetectionInWizardTest.java | 4 +- .../actions/ReformatCodeActionTest.java | 4 +- .../completion/HeavyCompletionTest.java | 6 +-- .../HeavySmartTypeCompletion15Test.java | 6 +-- .../DataFlowInspectionHeavyTest.java | 6 +-- .../execution/BaseConfigurationTestCase.java | 4 +- .../java/navigation/ChooseByNameHddTest.java | 8 ++-- .../psi/impl/cache/impl/FindClassTest.java | 6 +-- ...lveClassInModulesWithDependenciesTest.java | 4 +- .../java/psi/search/ClassInheritorsTest.java | 8 ++-- .../java/psi/search/FindUsagesTest.java | 4 +- .../roots/AutomaticModuleUnloaderTest.kt | 4 +- .../intellij/roots/ExportingModulesTest.java | 8 ++-- .../com/intellij/roots/ModuleScopesTest.java | 42 +++++++++---------- .../roots/MultiModuleEditingTest.java | 16 +++---- .../roots/UnloadedModulesConfigurationTest.kt | 4 +- .../com/intellij/util/indexing/IndexTest.java | 4 +- .../testFramework/JavaModuleTestCase.java | 4 +- .../testFramework/JavaProjectTestCase.java | 4 +- platform/eel/codegen/BuildersGeneratorTest.kt | 4 +- .../src/actions/NewRemoteDevModuleAction.kt | 6 +-- .../src/build/PluginBuildUtil.java | 4 +- ...ginXmlContentDependencyDescriptorTest.java | 4 +- .../codeInsight/PluginXmlFunctionalTest.java | 4 +- ...luginXmlRegistrationCheckInspectionTest.kt | 6 +-- .../importWizard/EclipseImportBuilder.java | 4 +- .../wizard/AbstractGradleModuleBuilder.java | 2 +- .../importing/GradleMiscImportingTest.java | 8 ++-- .../GradleCompositeImportingTest.java | 14 +++---- .../compiler/GroovyCompilerTestCase.java | 2 +- .../resolve/GroovyMultiModuleResolveTest.kt | 6 +-- .../idea/maven/importing/MavenImporter.java | 4 +- .../wizards/AbstractMavenModuleBuilder.java | 2 +- .../MavenFrameworkSupportProvider.java | 4 +- .../maven/testFramework/MavenTestCase.kt | 4 +- .../testFramework/MavenTestCaseLegacy.kt | 4 +- .../UnusedPropertyInspectionTest.java | 4 +- 44 files changed, 128 insertions(+), 130 deletions(-) diff --git a/java/compiler/tests/com/intellij/compiler/artifacts/UpdateArtifactsAfterRenameTest.java b/java/compiler/tests/com/intellij/compiler/artifacts/UpdateArtifactsAfterRenameTest.java index cfc4639bfa62..7fb159c40035 100644 --- a/java/compiler/tests/com/intellij/compiler/artifacts/UpdateArtifactsAfterRenameTest.java +++ b/java/compiler/tests/com/intellij/compiler/artifacts/UpdateArtifactsAfterRenameTest.java @@ -144,7 +144,7 @@ public class UpdateArtifactsAfterRenameTest extends PackagingElementsTestCase { public void testRenameModule() throws ModuleWithNameAlreadyExists { final ModuleManager moduleManager = ModuleManager.getInstance(myProject); final Module module = WriteAction.computeAndWait(() -> { - Module res = moduleManager.newModule(getProjectBasePath() + "/myModule.iml", StdModuleTypes.JAVA.getId()); + Module res = moduleManager.newModule(getProjectBasePath() + "/myModule.iml", JavaModuleType.getModuleType().getId()); return res; }); final Artifact artifact = addArtifact(root().module(module).moduleSource(module)); diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt index ddea424d81be..1abfacb05779 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectWizardJdkComboBox.kt @@ -18,7 +18,6 @@ import com.intellij.openapi.application.ModalityState import com.intellij.openapi.application.asContextElement import com.intellij.openapi.components.Service import com.intellij.openapi.components.service -import com.intellij.openapi.module.StdModuleTypes.JAVA import com.intellij.openapi.observable.properties.GraphProperty import com.intellij.openapi.observable.util.whenDisposed import com.intellij.openapi.progress.runBlockingMaybeCancellable @@ -70,7 +69,7 @@ import javax.swing.Icon import javax.swing.JList import kotlin.io.path.Path -private val selectedJdkProperty = "jdk.selected.${JAVA.id}" +private val selectedJdkProperty = "jdk.selected.JAVA_MODULE" /** * @param sdkFilter Filter for registered SDKs diff --git a/java/idea-ui/src/com/intellij/ide/starters/local/StarterModuleBuilder.kt b/java/idea-ui/src/com/intellij/ide/starters/local/StarterModuleBuilder.kt index cd07cd550820..2749f8560a3c 100644 --- a/java/idea-ui/src/com/intellij/ide/starters/local/StarterModuleBuilder.kt +++ b/java/idea-ui/src/com/intellij/ide/starters/local/StarterModuleBuilder.kt @@ -29,9 +29,9 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemUtil import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.fileEditor.FileEditorManager import com.intellij.openapi.fileEditor.OpenFileDescriptor +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.options.ConfigurationException import com.intellij.openapi.progress.runBackgroundableTask import com.intellij.openapi.project.Project @@ -61,7 +61,6 @@ import org.jetbrains.annotations.TestOnly import java.io.IOException import java.net.URL import javax.swing.Icon -import kotlin.Throws abstract class StarterModuleBuilder : ModuleBuilder() { companion object { @@ -169,7 +168,7 @@ abstract class StarterModuleBuilder : ModuleBuilder() { protected val starterContext: StarterContext = StarterContext() private val starterSettings: StarterWizardSettings by lazy { createSettings() } - override fun getModuleType(): ModuleType<*> = StdModuleTypes.JAVA + override fun getModuleType(): ModuleType<*> = JavaModuleType.getModuleType() override fun getWeight(): Int = JVM_WEIGHT open fun getHelpId(): String? = null diff --git a/java/idea-ui/src/com/intellij/ide/ultimatepromo/PromoSpringModuleBuilder.kt b/java/idea-ui/src/com/intellij/ide/ultimatepromo/PromoSpringModuleBuilder.kt index 1e65a505176f..a3e65a67bc64 100644 --- a/java/idea-ui/src/com/intellij/ide/ultimatepromo/PromoSpringModuleBuilder.kt +++ b/java/idea-ui/src/com/intellij/ide/ultimatepromo/PromoSpringModuleBuilder.kt @@ -8,8 +8,8 @@ import com.intellij.ide.wizard.withVisualPadding import com.intellij.java.ui.icons.JavaUIIcons import com.intellij.openapi.Disposable import com.intellij.openapi.extensions.PluginId +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.updateSettings.impl.pluginsAdvertisement.* import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.util.registry.Registry @@ -23,7 +23,7 @@ private const val SPRING_PLUGIN_ID = "com.intellij.spring" internal class PromoSpringModuleBuilder : ModuleBuilder(), PromoModuleBuilder { override fun isAvailable(): Boolean = Registry.`is`("idea.ultimate.features.hints.enabled") - override fun getModuleType(): ModuleType<*> = StdModuleTypes.JAVA + override fun getModuleType(): ModuleType<*> = JavaModuleType.getModuleType() override fun getWeight(): Int = JVM_WEIGHT override fun getBuilderId(): String = "promo-spring" diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/JavaModuleInsight.java b/java/idea-ui/src/com/intellij/ide/util/importProject/JavaModuleInsight.java index 60b84e3d86ec..5f3f185f696a 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/JavaModuleInsight.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/JavaModuleInsight.java @@ -11,7 +11,7 @@ import com.intellij.lang.java.JavaParserDefinition; import com.intellij.lexer.Lexer; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.module.StdModuleTypes; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.ProjectManager; @@ -247,7 +247,7 @@ public final class JavaModuleInsight extends ModuleInsight { @Override protected ModuleDescriptor createModuleDescriptor(final File moduleContentRoot, final Collection sourceRoots) { - return new ModuleDescriptor(moduleContentRoot, StdModuleTypes.JAVA, sourceRoots); + return new ModuleDescriptor(moduleContentRoot, JavaModuleType.getModuleType(), sourceRoots); } @Override diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java index be1566fda503..3ba56cd2e858 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AddModuleDependencyAction.java @@ -2,8 +2,8 @@ package com.intellij.openapi.roots.ui.configuration.classpath; import com.intellij.ide.JavaUiBundle; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ui.configuration.ChooseModulesDialog; import com.intellij.openapi.roots.ui.configuration.projectRoot.StructureConfigurableContext; @@ -23,7 +23,7 @@ class AddModuleDependencyAction extends AddItemPopupAction { int actionIndex, StructureConfigurableContext context) { super(classpathPanel, actionIndex, JavaUiBundle.message("classpath.add.module.dependency.action"), - StdModuleTypes.JAVA.getIcon()); + JavaModuleType.getModuleType().getIcon()); myContext = context; } diff --git a/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorFacade.java b/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorFacade.java index 8736c983b2d3..0049909cd352 100644 --- a/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorFacade.java +++ b/java/idea-ui/testSrc/com/intellij/facet/mock/MockFacetEditorFacade.java @@ -8,8 +8,8 @@ import com.intellij.facet.FacetType; import com.intellij.facet.FacetTypeId; import com.intellij.facet.impl.ui.FacetEditorFacade; import com.intellij.facet.impl.ui.FacetTreeModel; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable; import org.jetbrains.annotations.Nullable; @@ -41,7 +41,7 @@ public class MockFacetEditorFacade implements FacetEditorFacade { @Override @Nullable public ModuleType getSelectedModuleType() { - return StdModuleTypes.JAVA; + return JavaModuleType.getModuleType(); } @Override diff --git a/java/idea-ui/testSrc/com/intellij/framework/detection/FrameworkDetectionInWizardTest.java b/java/idea-ui/testSrc/com/intellij/framework/detection/FrameworkDetectionInWizardTest.java index a88f95d7a72c..2319c6f2be99 100644 --- a/java/idea-ui/testSrc/com/intellij/framework/detection/FrameworkDetectionInWizardTest.java +++ b/java/idea-ui/testSrc/com/intellij/framework/detection/FrameworkDetectionInWizardTest.java @@ -16,7 +16,7 @@ import com.intellij.ide.util.importProject.ModuleDescriptor; import com.intellij.ide.util.projectWizard.importSources.JavaModuleSourceRoot; import com.intellij.mock.MockProgressIndicator; import com.intellij.openapi.application.ex.PathManagerEx; -import com.intellij.openapi.module.StdModuleTypes; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; @@ -61,7 +61,7 @@ public class FrameworkDetectionInWizardTest extends FrameworkDetectionTestCase { FrameworkDetectionProcessor processor = new FrameworkDetectionProcessor(new MockProgressIndicator(), new FrameworkDetectionInWizardContext() { @Override protected List getModuleDescriptors() { - final ModuleDescriptor descriptor = new ModuleDescriptor(root, StdModuleTypes.JAVA, new JavaModuleSourceRoot(root, null, "java")); + final ModuleDescriptor descriptor = new ModuleDescriptor(root, JavaModuleType.getModuleType(), new JavaModuleSourceRoot(root, null, "java")); descriptor.setName(myModule.getName()); return Collections.singletonList(descriptor); } diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionTest.java index b79da226fb12..820a6edd6254 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/actions/ReformatCodeActionTest.java @@ -6,9 +6,9 @@ import com.intellij.codeInsight.actions.ReformatFilesOptions; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.impl.SimpleDataContext; import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.vfs.VirtualFile; @@ -225,7 +225,7 @@ public class ReformatCodeActionTest extends JavaPsiTestCase { String path = dir.getVirtualFile().getPath() + "/" + newModuleName + ".iml"; Module module = WriteAction - .compute(() -> ModuleManager.getInstance(getProject()).newModule(path, StdModuleTypes.JAVA.getId())); + .compute(() -> ModuleManager.getInstance(getProject()).newModule(path, JavaModuleType.getModuleType().getId())); PsiDirectory src = createDirectory(dir.getVirtualFile(), "src"); PsiTestUtil.addSourceRoot(module, src.getVirtualFile()); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavyCompletionTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavyCompletionTest.java index dc55306ebab1..4e4051df77ce 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavyCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavyCompletionTest.java @@ -11,8 +11,8 @@ import com.intellij.codeInsight.lookup.LookupElementPresentation; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.extensions.LoadingOrder; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.*; @@ -113,7 +113,7 @@ public class HeavyCompletionTest extends JavaCodeInsightFixtureTestCase { @NeedsIndex.Full public void testQualifyInaccessibleClassName() throws Exception { - PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "second", myFixture.getTempDirFixture().findOrCreateDir("second")); + PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "second", myFixture.getTempDirFixture().findOrCreateDir("second")); myFixture.addFileToProject("second/foo/bar/AxBxCxDxEx.java", "package foo.bar; class AxBxCxDxEx {}"); myFixture.configureByText("a.java", "class Main { ABCDE }"); @@ -204,7 +204,7 @@ public class HeavyCompletionTest extends JavaCodeInsightFixtureTestCase { ((StatisticsManagerImpl)StatisticsManager.getInstance()).enableStatistics(myFixture.getTestRootDisposable()); Module anotherModule = - PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "another", myFixture.getTempDirFixture().findOrCreateDir("another")); + PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "another", myFixture.getTempDirFixture().findOrCreateDir("another")); ModuleRootModificationUtil.setModuleSdk(anotherModule, IdeaTestUtil.getMockJdk17()); Sdk jdk14 = IdeaTestUtil.getMockJdk14(); WriteAction.runAndWait(() -> ProjectJdkTable.getInstance().addJdk(jdk14, getTestRootDisposable())); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavySmartTypeCompletion15Test.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavySmartTypeCompletion15Test.java index e66f3ad65e36..02e43fcad894 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavySmartTypeCompletion15Test.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/completion/HeavySmartTypeCompletion15Test.java @@ -3,8 +3,8 @@ package com.intellij.java.codeInsight.completion; import com.intellij.JavaTestUtil; import com.intellij.codeInsight.completion.CompletionType; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.testFramework.NeedsIndex; import com.intellij.testFramework.PsiTestUtil; @@ -77,8 +77,8 @@ public class HeavySmartTypeCompletion15Test extends JavaCodeInsightFixtureTestCa } public void testInaccessibleClassAfterNew() throws IOException { - Module moduleA = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "A", myFixture.getTempDirFixture().findOrCreateDir("a")); - Module moduleB = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "B", myFixture.getTempDirFixture().findOrCreateDir("b")); + Module moduleA = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "A", myFixture.getTempDirFixture().findOrCreateDir("a")); + Module moduleB = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "B", myFixture.getTempDirFixture().findOrCreateDir("b")); ModuleRootModificationUtil.addDependency(getModule(), moduleB); ModuleRootModificationUtil.addDependency(moduleB, moduleA); diff --git a/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionHeavyTest.java b/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionHeavyTest.java index 74cfdce20f7d..35a3dca91a3c 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionHeavyTest.java +++ b/java/java-tests/testSrc/com/intellij/java/codeInspection/DataFlowInspectionHeavyTest.java @@ -3,8 +3,8 @@ package com.intellij.java.codeInspection; import com.intellij.JavaTestUtil; import com.intellij.codeInspection.dataFlow.ConstantValueInspection; import com.intellij.codeInspection.dataFlow.DataFlowInspection; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.pom.java.LanguageLevel; @@ -23,7 +23,7 @@ public class DataFlowInspectionHeavyTest extends JavaCodeInsightFixtureTestCase public void testDifferentAnnotationsWithDifferentLanguageLevels() throws IOException { Module module6 = - PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "mod6", myFixture.getTempDirFixture().findOrCreateDir("mod6")); + PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "mod6", myFixture.getTempDirFixture().findOrCreateDir("mod6")); IdeaTestUtil.setModuleLanguageLevel(module6, LanguageLevel.JDK_1_6); IdeaTestUtil.setModuleLanguageLevel(getModule(), LanguageLevel.JDK_1_8); ModuleRootModificationUtil.addDependency(getModule(), module6); @@ -100,7 +100,7 @@ public class DataFlowInspectionHeavyTest extends JavaCodeInsightFixtureTestCase String noJsr305dep = "noJsr305dep"; Module anotherModule = - PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, noJsr305dep, myFixture.getTempDirFixture().findOrCreateDir(noJsr305dep)); + PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), noJsr305dep, myFixture.getTempDirFixture().findOrCreateDir(noJsr305dep)); ModuleRootModificationUtil.setModuleSdk(anotherModule, ModuleRootManager.getInstance(getModule()).getSdk()); PsiFile nullableNick = myFixture.addFileToProject(noJsr305dep + "/bar/NullableNick.java", DataFlowInspectionTest.barNullableNick()); diff --git a/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java b/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java index d29c10a16357..9c74bca4bec6 100644 --- a/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java +++ b/java/java-tests/testSrc/com/intellij/java/execution/BaseConfigurationTestCase.java @@ -14,10 +14,10 @@ import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.PlatformCoreDataKeys; import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.ModuleUtilCore; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.ModuleRootModificationUtil; @@ -106,7 +106,7 @@ public abstract class BaseConfigurationTestCase extends JavaProjectTestCase { public static @NotNull Module createTempModule(@NotNull TemporaryDirectory tempDir, Project project) { Path tempPath = tempDir.newPath(".iml"); ModuleManager moduleManager = ModuleManager.getInstance(project); - Module result = WriteAction.compute(() -> moduleManager.newModule(tempPath, StdModuleTypes.JAVA.getId())); + Module result = WriteAction.compute(() -> moduleManager.newModule(tempPath, JavaModuleType.getModuleType().getId())); PlatformTestUtil.saveProject(project); IndexingTestUtil.waitUntilIndexesAreReady(project); return result; diff --git a/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameHddTest.java b/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameHddTest.java index 9e286d77bf20..9bd02c4e2b6f 100644 --- a/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameHddTest.java +++ b/java/java-tests/testSrc/com/intellij/java/navigation/ChooseByNameHddTest.java @@ -2,9 +2,9 @@ package com.intellij.java.navigation; import com.intellij.ide.actions.searcheverywhere.SearchEverywhereContributor; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -43,7 +43,7 @@ public class ChooseByNameHddTest extends JavaCodeInsightFixtureTestCase { List modules = new ArrayList<>(); for (int i = 0; i < moduleCount; i++) { modules.add( - PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "mod" + i, myFixture.getTempDirFixture().findOrCreateDir("mod" + i))); + PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "mod" + i, myFixture.getTempDirFixture().findOrCreateDir("mod" + i))); } ModuleRootModificationUtil.addDependency(myFixture.getModule(), modules.get(2)); @@ -61,8 +61,8 @@ public class ChooseByNameHddTest extends JavaCodeInsightFixtureTestCase { } public void test_paths_relative_to_topmost_module() throws IOException { - PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "m1", myFixture.getTempDirFixture().findOrCreateDir("foo")); - PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "m2", myFixture.getTempDirFixture().findOrCreateDir("foo/bar")); + PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "m1", myFixture.getTempDirFixture().findOrCreateDir("foo")); + PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "m2", myFixture.getTempDirFixture().findOrCreateDir("foo/bar")); PsiFile file = myFixture.addFileToProject("foo/bar/goo/doo.txt", ""); SearchEverywhereContributor contributor = ChooseByNameTest.createFileContributor(getProject(), getTestRootDisposable(), file); diff --git a/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/FindClassTest.java b/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/FindClassTest.java index f6e01267b947..f926b6c047ce 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/FindClassTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/impl/cache/impl/FindClassTest.java @@ -7,10 +7,10 @@ import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileTypeManager; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; @@ -195,14 +195,14 @@ public class FindClassTest extends JavaPsiTestCase { final List newModules = new ArrayList<>(); ApplicationManager.getApplication().runWriteAction(() -> { ModifiableModuleModel modifiableModel = ModuleManager.getInstance(getProject()).getModifiableModel(); - Module module2 = modifiableModel.newModule("a.iml", StdModuleTypes.JAVA.getId()); + Module module2 = modifiableModel.newModule("a.iml", JavaModuleType.getModuleType().getId()); newModules.add(module2); ModuleRootModificationUtil.addDependency(module2, getModule()); File repoLib = new File(PathManagerEx.getTestDataPath(), "/psi/cls/repo/"); VirtualFile repoRoot = LocalFileSystem.getInstance().findFileByIoFile(repoLib); assertNotNull(repoRoot); ModuleRootModificationUtil.addModuleLibrary(module2, repoRoot.getUrl()); - newModules.add(modifiableModel.newModule("b.iml", StdModuleTypes.JAVA.getId())); + newModules.add(modifiableModel.newModule("b.iml", JavaModuleType.getModuleType().getId())); modifiableModel.commit(); }); IndexingTestUtil.waitUntilIndexesAreReady(getProject()); diff --git a/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveClassInModulesWithDependenciesTest.java b/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveClassInModulesWithDependenciesTest.java index fb04baaa118b..d78bfad6eb73 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveClassInModulesWithDependenciesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/resolve/ResolveClassInModulesWithDependenciesTest.java @@ -44,7 +44,7 @@ public class ResolveClassInModulesWithDependenciesTest extends JavaResolveTestCa public void testTwoModulesJavadocRef() throws Exception { Module unrelated = WriteAction.compute(() -> { ModifiableModuleModel modifiableModel = ModuleManager.getInstance(getProject()).getModifiableModel(); - Module module = modifiableModel.newModule("b.iml", StdModuleTypes.JAVA.getId()); + Module module = modifiableModel.newModule("b.iml", JavaModuleType.getModuleType().getId()); modifiableModel.commit(); return module; }); @@ -88,7 +88,7 @@ public class ResolveClassInModulesWithDependenciesTest extends JavaResolveTestCa private void configureDependency() { ApplicationManager.getApplication().runWriteAction(() -> { ModifiableModuleModel modifiableModel = ModuleManager.getInstance(getProject()).getModifiableModel(); - Module module = modifiableModel.newModule("a.iml", StdModuleTypes.JAVA.getId()); + Module module = modifiableModel.newModule("a.iml", JavaModuleType.getModuleType().getId()); modifiableModel.commit(); VirtualFile root = LocalFileSystem.getInstance().refreshAndFindFileByPath(getTestDataPath() + "/class/dependentModule"); diff --git a/java/java-tests/testSrc/com/intellij/java/psi/search/ClassInheritorsTest.java b/java/java-tests/testSrc/com/intellij/java/psi/search/ClassInheritorsTest.java index 3bb6e9a83f6d..5099b9b9a540 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/search/ClassInheritorsTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/search/ClassInheritorsTest.java @@ -2,8 +2,8 @@ package com.intellij.java.psi.search; import com.intellij.concurrency.JobScheduler; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.util.StandardProgressIndicatorBase; @@ -139,8 +139,8 @@ public class ClassInheritorsTest extends JavaCodeInsightFixtureTestCase { myFixture.addFileToProject("mod1/B.java", "class B extends A {}"); myFixture.addFileToProject("mod2/C.java", "class C extends B {}"); - Module mod1 = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "mod1", myFixture.getTempDirFixture().findOrCreateDir("mod1")); - Module mod2 = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "mod2", myFixture.getTempDirFixture().findOrCreateDir("mod2")); + Module mod1 = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "mod1", myFixture.getTempDirFixture().findOrCreateDir("mod1")); + Module mod2 = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "mod2", myFixture.getTempDirFixture().findOrCreateDir("mod2")); ModuleRootModificationUtil.addDependency(mod1, getModule(), DependencyScope.COMPILE, true); ModuleRootModificationUtil.addDependency(mod2, mod1, DependencyScope.COMPILE, false); @@ -153,7 +153,7 @@ public class ClassInheritorsTest extends JavaCodeInsightFixtureTestCase { myFixture.addFileToProject("mod2/C.java", "class C extends B {}"); PsiTestUtil.addSourceRoot(getModule(), myFixture.getTempDirFixture().findOrCreateDir("tests"), true); - Module mod2 = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "mod2", myFixture.getTempDirFixture().findOrCreateDir("mod2")); + Module mod2 = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "mod2", myFixture.getTempDirFixture().findOrCreateDir("mod2")); ModuleRootModificationUtil.updateModel(mod2, model -> model.addModuleOrderEntry(getModule()).setProductionOnTestDependency(true)); diff --git a/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java b/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java index a6c17dafe147..2d640c9a996b 100644 --- a/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java +++ b/java/java-tests/testSrc/com/intellij/java/psi/search/FindUsagesTest.java @@ -14,9 +14,9 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.command.WriteCommandAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.IndexNotReadyException; @@ -172,7 +172,7 @@ public class FindUsagesTest extends JavaPsiTestCase { try { WriteCommandAction.writeCommandAction(getProject()).run(() -> { final ModifiableModuleModel moduleModel = ModuleManager.getInstance(getProject()).getModifiableModel(); - moduleModel.newModule("independent/independent.iml", StdModuleTypes.JAVA.getId()); + moduleModel.newModule("independent/independent.iml", JavaModuleType.getModuleType().getId()); moduleModel.commit(); tdf.createFile("plugin.xml", """ diff --git a/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt b/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt index 350e6c190b4e..dd9795a52c00 100644 --- a/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt +++ b/java/java-tests/testSrc/com/intellij/roots/AutomaticModuleUnloaderTest.kt @@ -6,9 +6,9 @@ import com.intellij.openapi.application.EDT import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.components.impl.stores.stateStore import com.intellij.openapi.module.AutomaticModuleUnloader +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectManagerEx import com.intellij.openapi.roots.ModuleRootModificationUtil @@ -358,7 +358,7 @@ class AutomaticModuleUnloaderTest(private val reloadingMode: ReloadingMode) { withContext(Dispatchers.EDT) { ApplicationManager.getApplication().runWriteAction { moduleFiles.forEach { - moduleManager.newModule(it.toAbsolutePath().toString(), StdModuleTypes.JAVA.id) + moduleManager.newModule(it.toAbsolutePath().toString(), JavaModuleType.getModuleType().id) } } } diff --git a/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java b/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java index 2dff9d524930..490573fdeb0a 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ExportingModulesTest.java @@ -3,10 +3,10 @@ package com.intellij.roots; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.PathManagerEx; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.DependencyScope; import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -35,10 +35,10 @@ public class ExportingModulesTest extends JavaProjectTestCase { ApplicationManager.getApplication().runWriteAction(() -> { ModifiableModuleModel moduleModel = ModuleManager.getInstance(myProject).getModifiableModel(); - Module moduleA = moduleModel.newModule(dir.resolve("A.iml"), StdModuleTypes.JAVA.getId()); + Module moduleA = moduleModel.newModule(dir.resolve("A.iml"), JavaModuleType.getModuleType().getId()); - moduleB[0] = moduleModel.newModule(dir.resolve("B.iml"), StdModuleTypes.JAVA.getId()); - moduleC[0] = moduleModel.newModule(dir.resolve("C.iml"), StdModuleTypes.JAVA.getId()); + moduleB[0] = moduleModel.newModule(dir.resolve("B.iml"), JavaModuleType.getModuleType().getId()); + moduleC[0] = moduleModel.newModule(dir.resolve("C.iml"), JavaModuleType.getModuleType().getId()); moduleModel.commit(); configureModule(moduleA, testRoot, "A"); diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java b/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java index 6565bc25cb63..0622cff76862 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ModuleScopesTest.java @@ -2,8 +2,8 @@ package com.intellij.roots; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.module.impl.scopes.LibraryScope; import com.intellij.openapi.roots.DependencyScope; import com.intellij.openapi.roots.ModuleRootManager; @@ -49,7 +49,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testBasics() throws Exception { - Module moduleA = createModule("a.iml", StdModuleTypes.JAVA); + Module moduleA = createModule("a.iml", JavaModuleType.getModuleType()); addDependentModule(moduleA, DependencyScope.COMPILE); addLibrary(moduleA, DependencyScope.COMPILE); @@ -122,7 +122,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testTestOnlyModuleDependency() throws Exception { - Module moduleA = createModule("a.iml", StdModuleTypes.JAVA); + Module moduleA = createModule("a.iml", JavaModuleType.getModuleType()); Module moduleB = addDependentModule(moduleA, DependencyScope.TEST); VirtualFile classB = myFixture.createFile("b/Test.java", "public class Test { }"); @@ -143,7 +143,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } private Module addDependentModule(Module moduleA, DependencyScope scope) { - Module moduleB = createModule("b" + ".iml", StdModuleTypes.JAVA); + Module moduleB = createModule("b" + ".iml", JavaModuleType.getModuleType()); ApplicationManager.getApplication().runWriteAction(() -> { VirtualFile rootB = myFixture.findOrCreateDir("b"); @@ -159,10 +159,10 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testModuleTwiceInDependents() { - Module m = createModule("m.iml", StdModuleTypes.JAVA); - Module a = createModule("a.iml", StdModuleTypes.JAVA); - Module b = createModule("b.iml", StdModuleTypes.JAVA); - Module c = createModule("c.iml", StdModuleTypes.JAVA); + Module m = createModule("m.iml", JavaModuleType.getModuleType()); + Module a = createModule("a.iml", JavaModuleType.getModuleType()); + Module b = createModule("b.iml", JavaModuleType.getModuleType()); + Module c = createModule("c.iml", JavaModuleType.getModuleType()); ModuleRootModificationUtil.addDependency(a, m, DependencyScope.COMPILE, false); ModuleRootModificationUtil.addDependency(b, m, DependencyScope.COMPILE, true); @@ -178,10 +178,10 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testModuleContentWithDependenciesScopeRootOrdering() { - Module m = createModule("m.iml", StdModuleTypes.JAVA); - Module a = createModule("a.iml", StdModuleTypes.JAVA); - Module b = createModule("b.iml", StdModuleTypes.JAVA); - Module c = createModule("c.iml", StdModuleTypes.JAVA); + Module m = createModule("m.iml", JavaModuleType.getModuleType()); + Module a = createModule("a.iml", JavaModuleType.getModuleType()); + Module b = createModule("b.iml", JavaModuleType.getModuleType()); + Module c = createModule("c.iml", JavaModuleType.getModuleType()); ModuleRootModificationUtil.addDependency(b, m, DependencyScope.COMPILE, true); ModuleRootModificationUtil.addDependency(a, b, DependencyScope.COMPILE, true); @@ -214,7 +214,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testTestOnlyLibraryDependency() { - Module m = createModule("a.iml", StdModuleTypes.JAVA); + Module m = createModule("a.iml", JavaModuleType.getModuleType()); addLibrary(m, DependencyScope.TEST); VirtualFile libraryClass = myFixture.createFile("lib/Test.class"); @@ -228,7 +228,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testRuntimeModuleDependency() { - Module moduleA = createModule("a.iml", StdModuleTypes.JAVA); + Module moduleA = createModule("a.iml", JavaModuleType.getModuleType()); addDependentModule(moduleA, DependencyScope.RUNTIME); VirtualFile[] runtimeClasspath = getRuntimeClasspath(moduleA); assertEquals(1, runtimeClasspath.length); @@ -239,7 +239,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testRuntimeLibraryDependency() { - Module m = createModule("a.iml", StdModuleTypes.JAVA); + Module m = createModule("a.iml", JavaModuleType.getModuleType()); VirtualFile libraryRoot = addLibrary(m, DependencyScope.RUNTIME); VirtualFile[] runtimeClasspath = getRuntimeClasspath(m); @@ -259,7 +259,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testProvidedModuleDependency() { - Module moduleA = createModule("a.iml", StdModuleTypes.JAVA); + Module moduleA = createModule("a.iml", JavaModuleType.getModuleType()); addDependentModule(moduleA, DependencyScope.PROVIDED); VirtualFile[] runtimeClasspath = getRuntimeClasspath(moduleA); assertEmpty(runtimeClasspath); @@ -268,7 +268,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testProvidedLibraryDependency() { - Module m = createModule("a.iml", StdModuleTypes.JAVA); + Module m = createModule("a.iml", JavaModuleType.getModuleType()); VirtualFile libraryRoot = addLibrary(m, DependencyScope.PROVIDED); VirtualFile[] runtimeClasspath = getRuntimeClasspath(m); @@ -316,7 +316,7 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testScopeEquality() { - Module module = createModule("a.iml", StdModuleTypes.JAVA); + Module module = createModule("a.iml", JavaModuleType.getModuleType()); addDependentModule(module, DependencyScope.COMPILE); addLibrary(module, DependencyScope.COMPILE); @@ -340,9 +340,9 @@ public class ModuleScopesTest extends JavaModuleTestCase { } public void testHonorExportsWhenCalculatingLibraryScope() throws IOException { - Module a = createModule("a.iml", StdModuleTypes.JAVA); - Module b = createModule("b.iml", StdModuleTypes.JAVA); - Module c = createModule("c.iml", StdModuleTypes.JAVA); + Module a = createModule("a.iml", JavaModuleType.getModuleType()); + Module b = createModule("b.iml", JavaModuleType.getModuleType()); + Module c = createModule("c.iml", JavaModuleType.getModuleType()); ModuleRootModificationUtil.addDependency(a, b, DependencyScope.COMPILE, true); ModuleRootModificationUtil.addDependency(b, c, DependencyScope.COMPILE, true); diff --git a/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java b/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java index 203e76b52774..edcb00cd112b 100644 --- a/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java @@ -4,10 +4,10 @@ package com.intellij.roots; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.command.WriteCommandAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ContentEntry; @@ -56,8 +56,8 @@ public class MultiModuleEditingTest extends JavaModuleTestCase { { final ModifiableModuleModel modifiableModel = moduleManager.getModifiableModel(); - moduleA = modifiableModel.newModule(dir.resolve("a.iml"), StdModuleTypes.JAVA.getId()); - moduleB = modifiableModel.newModule(dir.resolve("b.iml"), StdModuleTypes.JAVA.getId()); + moduleA = modifiableModel.newModule(dir.resolve("a.iml"), JavaModuleType.getModuleType().getId()); + moduleB = modifiableModel.newModule(dir.resolve("b.iml"), JavaModuleType.getModuleType().getId()); assertEquals("Changes are not applied until commit", 0, moduleManager.getModules().length); //noinspection SSBasedInspection moduleListener.assertCorrectEvents(new String[0][]); @@ -97,8 +97,8 @@ public class MultiModuleEditingTest extends JavaModuleTestCase { final Module moduleB; { final ModifiableModuleModel moduleModel = moduleManager.getModifiableModel(); - moduleA = moduleModel.newModule(dir.resolve("a.iml"), StdModuleTypes.JAVA.getId()); - moduleB = moduleModel.newModule(dir.resolve("b.iml"), StdModuleTypes.JAVA.getId()); + moduleA = moduleModel.newModule(dir.resolve("a.iml"), JavaModuleType.getModuleType().getId()); + moduleB = moduleModel.newModule(dir.resolve("b.iml"), JavaModuleType.getModuleType().getId()); final ModifiableRootModel rootModelA = ModuleRootManager.getInstance(moduleA).getModifiableModel(); final ModifiableRootModel rootModelB = ModuleRootManager.getInstance(moduleB).getModifiableModel(); rootModelB.addModuleOrderEntry(moduleA); @@ -137,9 +137,9 @@ public class MultiModuleEditingTest extends JavaModuleTestCase { { final ModifiableModuleModel moduleModel = moduleManager.getModifiableModel(); - moduleA = moduleModel.newModule(dir.resolve("a.iml"), StdModuleTypes.JAVA.getId()); - moduleB = moduleModel.newModule(dir.resolve("b.iml"), StdModuleTypes.JAVA.getId()); - final Module moduleC = moduleModel.newModule(dir.resolve("c.iml"), StdModuleTypes.JAVA.getId()); + moduleA = moduleModel.newModule(dir.resolve("a.iml"), JavaModuleType.getModuleType().getId()); + moduleB = moduleModel.newModule(dir.resolve("b.iml"), JavaModuleType.getModuleType().getId()); + final Module moduleC = moduleModel.newModule(dir.resolve("c.iml"), JavaModuleType.getModuleType().getId()); final ModifiableRootModel rootModelB = ModuleRootManager.getInstance(moduleB).getModifiableModel(); rootModelB.addModuleOrderEntry(moduleC); moduleModel.disposeModule(moduleC); diff --git a/java/java-tests/testSrc/com/intellij/roots/UnloadedModulesConfigurationTest.kt b/java/java-tests/testSrc/com/intellij/roots/UnloadedModulesConfigurationTest.kt index 6a99620195d5..2a81ff8f336c 100644 --- a/java/java-tests/testSrc/com/intellij/roots/UnloadedModulesConfigurationTest.kt +++ b/java/java-tests/testSrc/com/intellij/roots/UnloadedModulesConfigurationTest.kt @@ -8,8 +8,8 @@ import com.intellij.facet.mock.registerFacetType import com.intellij.idea.TestFor import com.intellij.openapi.application.ex.PathManagerEx import com.intellij.openapi.application.runWriteAction +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.ModuleManager -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.openapi.util.io.FileUtil @@ -120,7 +120,7 @@ class UnloadedModulesConfigurationTest : JavaModuleTestCase() { assertEquals("a", assertOneElement(moduleManager.unloadedModuleDescriptions).name) runWriteAction { - moduleManager.newModule(aImlPath, StdModuleTypes.JAVA.id) + moduleManager.newModule(aImlPath, JavaModuleType.getModuleType().id) } assertEmpty(moduleManager.unloadedModuleDescriptions) assertEmpty(unloadedModuleEntities) diff --git a/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.java b/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.java index 27b6cfa7cb14..822ca7340d9b 100644 --- a/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.java +++ b/java/java-tests/testSrc/com/intellij/util/indexing/IndexTest.java @@ -24,8 +24,8 @@ import com.intellij.openapi.fileTypes.ExactFileNameMatcher; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.fileTypes.PlainTextFileType; import com.intellij.openapi.fileTypes.PlainTextLanguage; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.module.impl.scopes.ModuleWithDependentsScope; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; @@ -857,7 +857,7 @@ public class IndexTest extends JavaCodeInsightFixtureTestCase { assertNotNull(facade.findClass("A", GlobalSearchScope.moduleScope(getModule()))); final VirtualFile anotherDir = myFixture.getTempDirFixture().findOrCreateDir("another"); - Module anotherModule = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "another", anotherDir); + Module anotherModule = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), "another", anotherDir); assertNull(facade.findClass("A", GlobalSearchScope.moduleScope(anotherModule))); WriteAction.run(() -> srcFile.getVirtualFile().getParent().copy(this, anotherDir, "doo")); diff --git a/java/testFramework/src/com/intellij/testFramework/JavaModuleTestCase.java b/java/testFramework/src/com/intellij/testFramework/JavaModuleTestCase.java index 9cc7e52e1c25..1c2e0bf401f7 100644 --- a/java/testFramework/src/com/intellij/testFramework/JavaModuleTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/JavaModuleTestCase.java @@ -4,10 +4,10 @@ package com.intellij.testFramework; import com.intellij.ide.highlighter.ModuleFileType; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.ThrowableComputable; import com.intellij.openapi.util.io.FileUtil; @@ -63,7 +63,7 @@ public abstract class JavaModuleTestCase extends JavaProjectTestCase { } protected @NotNull Module createModule(@NotNull Path moduleFile) { - return createModule(moduleFile, StdModuleTypes.JAVA); + return createModule(moduleFile, JavaModuleType.getModuleType()); } protected @NotNull Module createModule(@NotNull Path moduleFile, @NotNull ModuleType moduleType) { diff --git a/java/testFramework/src/com/intellij/testFramework/JavaProjectTestCase.java b/java/testFramework/src/com/intellij/testFramework/JavaProjectTestCase.java index c5e338237f92..3da7ede8b15b 100644 --- a/java/testFramework/src/com/intellij/testFramework/JavaProjectTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/JavaProjectTestCase.java @@ -1,8 +1,8 @@ // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.testFramework; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.impl.JavaPsiFacadeEx; @@ -39,6 +39,6 @@ public abstract class JavaProjectTestCase extends HeavyPlatformTestCase { @Override protected @NotNull ModuleType getModuleType() { - return StdModuleTypes.JAVA; + return JavaModuleType.getModuleType(); } } diff --git a/platform/eel/codegen/BuildersGeneratorTest.kt b/platform/eel/codegen/BuildersGeneratorTest.kt index 1136dee370e7..0282bbc3812e 100644 --- a/platform/eel/codegen/BuildersGeneratorTest.kt +++ b/platform/eel/codegen/BuildersGeneratorTest.kt @@ -17,10 +17,10 @@ import com.intellij.openapi.application.writeAction import com.intellij.openapi.command.writeCommandAction import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.fileEditor.FileDocumentManager +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleUtilCore -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.project.Project import com.intellij.openapi.project.ex.ProjectManagerEx import com.intellij.openapi.project.modules @@ -377,7 +377,7 @@ class BuildersGeneratorTest { while (true) { val jpsModule = jpsModuleQueue.removeLastOrNull() ?: break - val module = projectModel.newModule(Path.of(tempProject.basePath!!).resolve(".idea/${jpsModule.name}.iml"), StdModuleTypes.JAVA.id) + val module = projectModel.newModule(Path.of(tempProject.basePath!!).resolve(".idea/${jpsModule.name}.iml"), JavaModuleType.getModuleType().id) val rootModel = module.rootManager.modifiableModel diff --git a/plugins/devkit/devkit-core/src/actions/NewRemoteDevModuleAction.kt b/plugins/devkit/devkit-core/src/actions/NewRemoteDevModuleAction.kt index 8d03c7520c6f..3650799faf03 100644 --- a/plugins/devkit/devkit-core/src/actions/NewRemoteDevModuleAction.kt +++ b/plugins/devkit/devkit-core/src/actions/NewRemoteDevModuleAction.kt @@ -4,15 +4,15 @@ package org.jetbrains.idea.devkit.actions import com.intellij.ide.SaveAndSyncHandler import com.intellij.openapi.actionSystem.* import com.intellij.openapi.application.EDT -import com.intellij.openapi.application.readAction import com.intellij.openapi.application.edtWriteAction +import com.intellij.openapi.application.readAction import com.intellij.openapi.command.CommandProcessor import com.intellij.openapi.components.Service import com.intellij.openapi.components.service import com.intellij.openapi.diagnostic.fileLogger +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.observable.util.onceWhenFocusGained import com.intellij.openapi.project.DumbAwareAction import com.intellij.openapi.project.IntelliJProjectUtil @@ -162,7 +162,7 @@ private class NewRemoteDevModuleAction : DumbAwareAction() { val moduleManager = ModuleManager.getInstance(project) val modifiableModel = moduleManager.getModifiableModel() // TODO: handle exception on `toNioPath` - val module = modifiableModel.newModule(moduleDirectories.moduleRoot.virtualFile.toNioPath().resolve(moduleName), StdModuleTypes.JAVA.id) + val module = modifiableModel.newModule(moduleDirectories.moduleRoot.virtualFile.toNioPath().resolve(moduleName), JavaModuleType.getModuleType().id) modifiableModel.commit() ModuleRootModificationUtil.updateModel(module) { diff --git a/plugins/devkit/devkit-core/src/build/PluginBuildUtil.java b/plugins/devkit/devkit-core/src/build/PluginBuildUtil.java index 40461ca9183f..2895e21520e1 100644 --- a/plugins/devkit/devkit-core/src/build/PluginBuildUtil.java +++ b/plugins/devkit/devkit-core/src/build/PluginBuildUtil.java @@ -2,10 +2,10 @@ package org.jetbrains.idea.devkit.build; import com.intellij.openapi.application.ReadAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.OrderEnumerator; @@ -43,7 +43,7 @@ public final class PluginBuildUtil { public static void getDependencies(Module module, final Set modules) { productionRuntimeDependencies(module).forEachModule(dep -> { - if (ModuleType.get(dep) == StdModuleTypes.JAVA && !modules.contains(dep)) { + if (ModuleType.get(dep) == JavaModuleType.getModuleType() && !modules.contains(dep)) { modules.add(dep); getDependencies(dep, modules); } diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlContentDependencyDescriptorTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlContentDependencyDescriptorTest.java index 84138ce887b8..cb54e5adbfbe 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlContentDependencyDescriptorTest.java +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlContentDependencyDescriptorTest.java @@ -6,8 +6,8 @@ import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementPresentation; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.PsiTestUtil; import com.intellij.testFramework.TestDataPath; @@ -113,7 +113,7 @@ public class PluginXmlContentDependencyDescriptorTest extends JavaCodeInsightFix final VirtualFile dependencyModuleRoot = myFixture.copyDirectoryToProject("/" + testName + "/" + moduleName, "/" + moduleName); - Module dependencyModule = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, moduleName, dependencyModuleRoot); + Module dependencyModule = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), moduleName, dependencyModuleRoot); PsiTestUtil.addLibrary(dependencyModule, "editor-ui-api", PathUtil.getJarPathForClass(AnAction.class)); } diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.java b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.java index c1718bb3ed46..5c9657124dd1 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.java +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.java @@ -18,8 +18,8 @@ import com.intellij.notification.impl.NotificationGroupEP; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.extensions.LoadingOrder; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.project.IntelliJProjectUtil; import com.intellij.openapi.roots.ModuleRootModificationUtil; @@ -269,7 +269,7 @@ public class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase { String moduleDescriptorFilename = name + ".xml"; VirtualFile moduleRoot = myFixture.getTempDirFixture().findOrCreateDir(name); VirtualFile file = myFixture.copyFileToProject(moduleDescriptorFilename, "/" + name + "/" + moduleDescriptorFilename); - Module dependencyModule = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, name, moduleRoot); + Module dependencyModule = PsiTestUtil.addModule(getProject(), JavaModuleType.getModuleType(), name, moduleRoot); ModuleRootModificationUtil.setModuleSdk(dependencyModule, IdeaTestUtil.getMockJdk17()); ModuleRootModificationUtil.addDependency(getModule(), dependencyModule); return file; diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt index 86265639d29a..40e18053d0c4 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlRegistrationCheckInspectionTest.kt @@ -8,7 +8,7 @@ import com.intellij.codeInsight.intention.IntentionAction import com.intellij.lang.LanguageExtensionPoint import com.intellij.lang.annotation.HighlightSeverity import com.intellij.openapi.actionSystem.AnAction -import com.intellij.openapi.module.StdModuleTypes +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.openapi.util.RecursionManager import com.intellij.openapi.util.TextRange @@ -57,10 +57,10 @@ class PluginXmlRegistrationCheckInspectionTest : JavaCodeInsightFixtureTestCase( @Throws(IOException::class) fun testRegistrationCheck() { - val anotherModule = PsiTestUtil.addModule(project, StdModuleTypes.JAVA, "anotherModule", + val anotherModule = PsiTestUtil.addModule(project, JavaModuleType.getModuleType(), "anotherModule", myTempDirFixture!!.findOrCreateDir("../anotherModuleDir")) ModuleRootModificationUtil.addModuleLibrary(anotherModule, VfsUtil.getUrlForLibraryRoot(File(PathUtil.getJarPathForClass(AnAction::class.java)))) - val additionalModule = PsiTestUtil.addModule(project, StdModuleTypes.JAVA, "additionalModule", + val additionalModule = PsiTestUtil.addModule(project, JavaModuleType.getModuleType(), "additionalModule", myTempDirFixture!!.findOrCreateDir("../additionalModuleDir")) ModuleRootModificationUtil.addModuleLibrary(anotherModule, VfsUtil.getUrlForLibraryRoot(File(PathUtil.getJarPathForClass(LanguageExtensionPoint::class.java)))) ModuleRootModificationUtil.addDependency(module, anotherModule) diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java index 64938d3509c2..fcdbdb9bee47 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java @@ -11,10 +11,10 @@ import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.module.impl.ModuleManagerEx; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -276,7 +276,7 @@ public final class EclipseImportBuilder extends ProjectImportBuilder imp modulesDirectory = path; } final Module module = moduleModel.newModule(modulesDirectory + "/" + EclipseProjectFinder.findProjectName(path) + ModuleManagerEx.IML_EXTENSION, - StdModuleTypes.JAVA.getId()); + JavaModuleType.getModuleType().getId()); result.add(module); final Set natures = collectNatures(path); diff --git a/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java b/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java index 30be229395e9..7392f8f51e0c 100644 --- a/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java +++ b/plugins/gradle/java/src/service/project/wizard/AbstractGradleModuleBuilder.java @@ -396,7 +396,7 @@ public abstract class AbstractGradleModuleBuilder extends AbstractExternalModule @Override public ModuleType getModuleType() { - return StdModuleTypes.JAVA; + return JavaModuleType.getModuleType(); } private @NotNull VirtualFile setupGradleBuildFile(@NotNull VirtualFile modelContentRootDir) diff --git a/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java b/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java index 13d20b60a7d1..62d5a4333422 100644 --- a/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java +++ b/plugins/gradle/java/testSources/importing/GradleMiscImportingTest.java @@ -12,9 +12,9 @@ import com.intellij.openapi.externalSystem.model.task.TaskData; import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider; import com.intellij.openapi.externalSystem.service.project.ProjectDataManager; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.projectRoots.ProjectJdkTable; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModifiableRootModel; @@ -365,8 +365,8 @@ public class GradleMiscImportingTest extends GradleJavaImportingTestCase { @Test public void testSourceSetModuleNamesForDeduplicatedMainModule() throws Exception { IdeModifiableModelsProvider modelsProvider = ProjectDataManager.getInstance().createModifiableModelsProvider(myProject); - modelsProvider.newModule(getProjectPath() + "/app.iml", StdModuleTypes.JAVA.getId()); - modelsProvider.newModule(getProjectPath() + "/my_group.app.main.iml", StdModuleTypes.JAVA.getId()); + modelsProvider.newModule(getProjectPath() + "/app.iml", JavaModuleType.getModuleType().getId()); + modelsProvider.newModule(getProjectPath() + "/my_group.app.main.iml", JavaModuleType.getModuleType().getId()); edt(() -> ApplicationManager.getApplication().runWriteAction(modelsProvider::commit)); createSettingsFile("rootProject.name = 'app'"); @@ -400,7 +400,7 @@ public class GradleMiscImportingTest extends GradleJavaImportingTestCase { edt(() -> { ApplicationManager.getApplication().runWriteAction(() -> { Module module = ModuleManager.getInstance(myProject).newModule( - getProjectPath() + "/" + "project" + ModuleFileType.DOT_DEFAULT_EXTENSION, StdModuleTypes.JAVA.getId()); + getProjectPath() + "/" + "project" + ModuleFileType.DOT_DEFAULT_EXTENSION, JavaModuleType.getModuleType().getId()); ModifiableRootModel modifiableModel = ModuleRootManager.getInstance(module).getModifiableModel(); modifiableModel.addContentEntry(myProjectRoot); modifiableModel.inheritSdk(); diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java index ba21f76ca7b6..78e548fab25a 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleCompositeImportingTest.java @@ -26,7 +26,7 @@ import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsPr import com.intellij.openapi.externalSystem.service.project.ProjectDataManager; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; import com.intellij.openapi.externalSystem.util.ExternalSystemUtil; -import com.intellij.openapi.module.StdModuleTypes; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtilRt; import org.jetbrains.annotations.NotNull; @@ -297,12 +297,12 @@ public class GradleCompositeImportingTest extends GradleImportingTestCase { @Test public void testCompositeBuildWithProjectNameDuplicates() throws Exception { IdeModifiableModelsProvider modelsProvider = ProjectDataManager.getInstance().createModifiableModelsProvider(myProject); - modelsProvider.newModule(getProjectPath() + "/api.iml", StdModuleTypes.JAVA.getId()); - modelsProvider.newModule(getProjectPath() + "/api_main.iml", StdModuleTypes.JAVA.getId()); - modelsProvider.newModule(getProjectPath() + "/my-app-api.iml", StdModuleTypes.JAVA.getId()); - modelsProvider.newModule(getProjectPath() + "/my-app-api_main.iml", StdModuleTypes.JAVA.getId()); - modelsProvider.newModule(getProjectPath() + "/my-utils-api.iml", StdModuleTypes.JAVA.getId()); - modelsProvider.newModule(getProjectPath() + "/my-utils-api_main.iml", StdModuleTypes.JAVA.getId()); + modelsProvider.newModule(getProjectPath() + "/api.iml", JavaModuleType.getModuleType().getId()); + modelsProvider.newModule(getProjectPath() + "/api_main.iml", JavaModuleType.getModuleType().getId()); + modelsProvider.newModule(getProjectPath() + "/my-app-api.iml", JavaModuleType.getModuleType().getId()); + modelsProvider.newModule(getProjectPath() + "/my-app-api_main.iml", JavaModuleType.getModuleType().getId()); + modelsProvider.newModule(getProjectPath() + "/my-utils-api.iml", JavaModuleType.getModuleType().getId()); + modelsProvider.newModule(getProjectPath() + "/my-utils-api_main.iml", JavaModuleType.getModuleType().getId()); edt(() -> ApplicationManager.getApplication().runWriteAction(modelsProvider::commit)); createSettingsFile(""" diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java index 7cb6e53c4395..f9e56108f124 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java @@ -178,7 +178,7 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC final VirtualFile depRoot = myFixture.getTempDirFixture().findOrCreateDir(name); final ModifiableModuleModel moduleModel = ModuleManager.getInstance(getProject()).getModifiableModel(); - String moduleName = moduleModel.newModule(depRoot.getPath() + "/" + name + ".iml", StdModuleTypes.JAVA.getId()).getName(); + String moduleName = moduleModel.newModule(depRoot.getPath() + "/" + name + ".iml", JavaModuleType.getModuleType().getId()).getName(); moduleModel.commit(); final Module dep = ModuleManager.getInstance(getProject()).findModuleByName(moduleName); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyMultiModuleResolveTest.kt b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyMultiModuleResolveTest.kt index 5c39167f9c3c..e895e2f3646e 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyMultiModuleResolveTest.kt +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/GroovyMultiModuleResolveTest.kt @@ -1,7 +1,7 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package org.jetbrains.plugins.groovy.lang.resolve -import com.intellij.openapi.module.StdModuleTypes +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.psi.PsiReference import com.intellij.testFramework.PsiTestUtil @@ -9,7 +9,7 @@ import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase class GroovyMultiModuleResolveTest : JavaCodeInsightFixtureTestCase() { fun `test same class from different modules`() { - val groovyModule = PsiTestUtil.addModule(project, StdModuleTypes.JAVA, "groovyModule", myFixture.tempDirFixture.findOrCreateDir("groovyModule")) + val groovyModule = PsiTestUtil.addModule(project, JavaModuleType.getModuleType(), "groovyModule", myFixture.tempDirFixture.findOrCreateDir("groovyModule")) myFixture.addFileToProject("groovyModule/foo/Foo.groovy", """ package foo @@ -17,7 +17,7 @@ class GroovyMultiModuleResolveTest : JavaCodeInsightFixtureTestCase() { """.trimIndent()) ModuleRootModificationUtil.addDependency(myFixture.module, groovyModule) - val javaModule = PsiTestUtil.addModule(project, StdModuleTypes.JAVA, "javaModule", myFixture.tempDirFixture.findOrCreateDir("javaModule")) + val javaModule = PsiTestUtil.addModule(project, JavaModuleType.getModuleType(), "javaModule", myFixture.tempDirFixture.findOrCreateDir("javaModule")) myFixture.addFileToProject("javaModule/foo/Foo.java", """ package foo; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java index 35420d2008e3..1c5fbc61ffe9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenImporter.java @@ -4,9 +4,9 @@ package org.jetbrains.idea.maven.importing; import com.intellij.ide.util.projectWizard.ModuleBuilder; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.util.PairConsumer; @@ -102,7 +102,7 @@ public abstract class MavenImporter { */ @Deprecated public @NotNull ModuleType getModuleType() { - return StdModuleTypes.JAVA; + return JavaModuleType.getModuleType(); } @SuppressWarnings("SpellCheckingInspection") diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/AbstractMavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/AbstractMavenModuleBuilder.java index eb4418f14025..2f4de2d89b6f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/AbstractMavenModuleBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/AbstractMavenModuleBuilder.java @@ -207,7 +207,7 @@ public abstract class AbstractMavenModuleBuilder extends ModuleBuilder implement @Override public ModuleType getModuleType() { - return StdModuleTypes.JAVA; + return JavaModuleType.getModuleType(); } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java index 70d5963cf865..6fed31c53bc0 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenFrameworkSupportProvider.java @@ -5,9 +5,9 @@ import com.intellij.ide.util.frameworkSupport.FrameworkSupportConfigurable; import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel; import com.intellij.ide.util.frameworkSupport.FrameworkSupportProvider; import com.intellij.ide.util.projectWizard.ModuleBuilder; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.vfs.VfsUtil; @@ -110,7 +110,7 @@ public final class MavenFrameworkSupportProvider extends FrameworkSupportProvide @Override public boolean isEnabledForModuleType(@NotNull ModuleType moduleType) { - return moduleType.equals(StdModuleTypes.JAVA); + return moduleType.equals(JavaModuleType.getModuleType()); } @Override diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt index 513909b11f06..56067e15c172 100644 --- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt +++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCase.kt @@ -10,10 +10,10 @@ import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.* import com.intellij.openapi.command.WriteCommandAction +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager.Companion.getInstance import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.progress.EmptyProgressIndicator import com.intellij.openapi.progress.runBlockingMaybeCancellable import com.intellij.openapi.project.Project @@ -458,7 +458,7 @@ abstract class MavenTestCase : UsefulTestCase() { } } - protected fun createModule(name: String): Module = createModule(name, StdModuleTypes.JAVA) + protected fun createModule(name: String): Module = createModule(name, JavaModuleType.getModuleType()) protected fun createProjectPom(@Language(value = "XML", prefix = "", suffix = "") xml: String): VirtualFile { diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCaseLegacy.kt b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCaseLegacy.kt index ab0aa83f3d79..6ebcf0b2b1ed 100644 --- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCaseLegacy.kt +++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenTestCaseLegacy.kt @@ -9,10 +9,10 @@ import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.DataContext import com.intellij.openapi.application.* import com.intellij.openapi.command.WriteCommandAction +import com.intellij.openapi.module.JavaModuleType import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager.Companion.getInstance import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.progress.EmptyProgressIndicator import com.intellij.openapi.progress.runBlockingMaybeCancellable import com.intellij.openapi.project.Project @@ -387,7 +387,7 @@ abstract class MavenTestCaseLegacy : UsefulTestCase() { } } - protected fun createModule(name: String): Module = createModule(name, StdModuleTypes.JAVA) + protected fun createModule(name: String): Module = createModule(name, JavaModuleType.getModuleType()) protected fun createProjectPom(@Language(value = "XML", prefix = "", suffix = "") xml: String): VirtualFile { diff --git a/plugins/properties/tests/testSrc/com/intellij/lang/properties/codeInspection/UnusedPropertyInspectionTest.java b/plugins/properties/tests/testSrc/com/intellij/lang/properties/codeInspection/UnusedPropertyInspectionTest.java index 8905103ffe0b..c7c608011814 100644 --- a/plugins/properties/tests/testSrc/com/intellij/lang/properties/codeInspection/UnusedPropertyInspectionTest.java +++ b/plugins/properties/tests/testSrc/com/intellij/lang/properties/codeInspection/UnusedPropertyInspectionTest.java @@ -3,9 +3,9 @@ package com.intellij.lang.properties.codeInspection; import com.intellij.lang.properties.codeInspection.unused.UnusedPropertyInspection; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.module.JavaModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.roots.ModuleRootModificationUtil; import com.intellij.openapi.roots.SourceFolder; import com.intellij.openapi.vfs.VirtualFile; @@ -43,7 +43,7 @@ public class UnusedPropertyInspectionTest extends CodeInsightFixtureTestCase moduleManager.newModule(path, StdModuleTypes.JAVA.getId())); + final Module module = WriteAction.compute(() -> moduleManager.newModule(path, JavaModuleType.getModuleType().getId())); ModuleRootModificationUtil.addDependency(module, myModule); configureSources(module);