MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[workspace model] IJPL-345 Introduce ModuleTypeId for ModuleEntity and remove the old class with the same name

Browse Source 
GitOrigin-RevId: ac34862b4287f024b694b4da918208f73585982d
This commit is contained in:
Mikhail Mazurkevich
2024-02-28 17:26:49 +04:00
committed by intellij-monorepo-bot
parent a1d4b59126
commit bdecd1aaef
47 changed files with 154 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java
View File

@@ -15,11 +15,12 @@
*/
package com.intellij.testFramework;
import com.intellij.openapi.module.ModuleTypeId;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.psi.impl.JavaPsiFacadeEx;
import org.jetbrains.annotations.NotNull;
import static com.intellij.workspaceModel.ide.legacyBridge.impl.java.JavaModuleTypeUtils.JAVA_MODULE_ENTITY_TYPE_ID_NAME;
/**
* A test case that provides IDEA application and project. Note both are reused for each test run in the session so
* be careful to return all the modification made to application and project components (such as settings) after
@@ -46,6 +47,6 @@ public abstract class LightIdeaTestCase extends LightPlatformTestCase {
@NotNull
@Override
protected String getModuleTypeId() {
return ModuleTypeId.JAVA_MODULE;
return JAVA_MODULE_ENTITY_TYPE_ID_NAME;
}
}

5
java/testFramework/src/com/intellij/testFramework/LightJavaCodeInsightTestCase.java
View File

@@ -3,7 +3,6 @@ package com.intellij.testFramework;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleTypeId;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.ModifiableRootModel;
@@ -16,6 +15,8 @@ import org.jetbrains.annotations.NotNull;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.intellij.workspaceModel.ide.legacyBridge.impl.java.JavaModuleTypeUtils.JAVA_MODULE_ENTITY_TYPE_ID_NAME;
/**
* A TestCase for single PsiFile being opened in Editor conversion. See configureXXX and checkResultXXX method docs.
*/
@@ -103,6 +104,6 @@ public abstract class LightJavaCodeInsightTestCase extends LightPlatformCodeInsi
@NotNull
@Override
protected String getModuleTypeId() {
return ModuleTypeId.JAVA_MODULE;
return JAVA_MODULE_ENTITY_TYPE_ID_NAME;
}
}

5
java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java
View File

@@ -16,7 +16,6 @@
package com.intellij.testFramework.fixtures;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleTypeId;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ContentEntry;
import com.intellij.openapi.roots.LanguageLevelModuleExtension;
@@ -31,6 +30,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Supplier;
import static com.intellij.workspaceModel.ide.legacyBridge.impl.java.JavaModuleTypeUtils.JAVA_MODULE_ENTITY_TYPE_ID_NAME;
public class DefaultLightProjectDescriptor extends LightProjectDescriptor {
private static final String JETBRAINS_ANNOTATIONS_COORDINATES = "org.jetbrains:annotations-java5:24.0.0";
private @Nullable Supplier<? extends Sdk> customSdk;
@@ -52,7 +53,7 @@ public class DefaultLightProjectDescriptor extends LightProjectDescriptor {
@Override
public @NotNull String getModuleTypeId() {
return ModuleTypeId.JAVA_MODULE;
return JAVA_MODULE_ENTITY_TYPE_ID_NAME;
}
@Override