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

Cleanup (formatting)

Browse Source 
GitOrigin-RevId: a9e40bacb038cdad234a77a0a58ae0cd40be9026
This commit is contained in:
Roman Shevchenko
2025-09-30 11:03:57 +00:00
committed by intellij-monorepo-bot
parent d0351a72d8
commit 038084ff21
2 changed files with 70 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/devkit-core/src/run/DevKitApplicationPatcher.kt
+21 -46
View File
@@ -5,19 +5,13 @@ import com.intellij.compiler.options.MakeProjectStepBeforeRun
import com.intellij.execution.JavaRunConfigurationBase
import com.intellij.execution.RunConfigurationExtension
import com.intellij.execution.application.ApplicationConfiguration
import com.intellij.execution.configurations.DebuggingRunnerData
import com.intellij.execution.configurations.JavaParameters
import com.intellij.execution.configurations.ParametersList
import com.intellij.execution.configurations.RunConfigurationBase
import com.intellij.execution.configurations.RunnerSettings
import com.intellij.execution.configurations.*
import com.intellij.execution.scratch.JavaScratchConfiguration
import com.intellij.openapi.application.PathManager
import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.IntelliJProjectUtil
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.util.SystemInfo
import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.platform.eel.provider.asEelPath
@@ -68,7 +62,7 @@ private class DevKitApplicationPatcher : RunConfigurationExtension() {
val isDevBuild = mainClass == "org.jetbrains.intellij.build.devServer.DevMainKt"
val vmParametersAsList = vmParameters.list
if (vmParametersAsList.contains("--add-modules") || (!isDevBuild && mainClass != "com.intellij.idea.Main")) {
if (vmParametersAsList.contains("--add-modules") || !isDevBuild && mainClass != "com.intellij.idea.Main") {
return
}
@@ -186,31 +180,28 @@ private class DevKitApplicationPatcher : RunConfigurationExtension() {
}
}
override fun isApplicableFor(configuration: RunConfigurationBase<*>): Boolean {
return configuration is ApplicationConfiguration
//use this instead of 'is KotlinRunConfiguration' to avoid having dependency on Kotlin plugin here
|| configuration.factory?.id == "JetRunConfigurationType"
}
}
override fun isApplicableFor(configuration: RunConfigurationBase<*>): Boolean =
configuration is ApplicationConfiguration ||
configuration.factory?.id == "JetRunConfigurationType" // to avoid a dependency on the Kotlin plugin
private fun setPropertyIfAbsent(vmParameters: ParametersList, @Suppress("SameParameterValue") name: String) {
if (!vmParameters.hasProperty(name)) {
vmParameters.addProperty(name, "true")
private fun setPropertyIfAbsent(vmParameters: ParametersList, @Suppress("SameParameterValue") name: String) {
if (!vmParameters.hasProperty(name)) {
vmParameters.addProperty(name, "true")
}
}
}
@Suppress("SpellCheckingInspection")
private fun getIdeSystemProperties(runDir: Path): Map<String, String> {
// see BuildContextImpl.getAdditionalJvmArguments - we should somehow deduplicate code
val libDir = runDir.resolve("lib")
return mapOf(
"jna.boot.library.path" to "$libDir/jna/${if (CpuArch.isArm64()) "aarch64" else "amd64"}",
"pty4j.preferred.native.folder" to "$libDir/pty4j",
// require bundled JNA dispatcher lib
"jna.nosys" to "true",
"jna.noclasspath" to "true",
"compose.swing.render.on.graphics" to "true",
)
private fun getIdeSystemProperties(runDir: Path): Map<String, String> {
// see BuildContextImpl.getAdditionalJvmArguments - we should somehow deduplicate code
val libDir = runDir.resolve("lib")
return mapOf(
"jna.boot.library.path" to "$libDir/jna/${if (CpuArch.isArm64()) "aarch64" else "amd64"}",
"pty4j.preferred.native.folder" to "$libDir/pty4j",
// require bundled JNA dispatcher lib
"jna.nosys" to "true",
"jna.noclasspath" to "true",
"compose.swing.render.on.graphics" to "true",
)
}
}
/**
@@ -320,19 +311,3 @@ internal fun enableIjentDefaultFsProvider(
vmParameters.add("-Xbootclasspath/a:${workingDirectory}/out/classes/production/$IJENT_BOOT_CLASSPATH_MODULE")
}
}
internal fun Module.hasIjentDefaultFsProviderInClassPath(): Boolean {
val queue = ArrayDeque(listOf(*ModuleRootManager.getInstance(this).getModuleDependencies()))
val seen = hashSetOf(this)
while (true) {
val module =
queue.removeFirstOrNull()
?: return false
if (module.name == IJENT_BOOT_CLASSPATH_MODULE) {
return true
}
if (seen.add(module)) {
queue.addAll(ModuleRootManager.getInstance(module).getModuleDependencies())
}
}
}
plugins/devkit/devkit-core/src/run/JUnitDevKitPatcher.java
+49 -39
View File
@@ -17,12 +17,10 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.JavaSdk;
import com.intellij.openapi.projectRoots.JavaSdkVersion;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkAdditionalData;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.openapi.util.UserDataHolder;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.platform.eel.EelApi;
import com.intellij.platform.eel.provider.EelProviderUtil;
import com.intellij.platform.eel.provider.utils.EelPathUtils;
import com.intellij.psi.JavaPsiFacade;
@@ -31,7 +29,6 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.ProjectScope;
import com.intellij.util.JavaModuleOptions;
import com.intellij.util.lang.UrlClassLoader;
import com.intellij.util.system.OS;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -42,28 +39,31 @@ import org.jetbrains.idea.devkit.projectRoots.Sandbox;
import org.jetbrains.idea.devkit.requestHandlers.BuiltInServerConnectionData;
import org.jetbrains.idea.devkit.util.DescriptorUtil;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayDeque;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import static com.intellij.platform.ijent.community.buildConstants.IjentBuildScriptsConstantsKt.IJENT_BOOT_CLASSPATH_MODULE;
@ApiStatus.Internal
public final class JUnitDevKitPatcher extends JUnitPatcher {
private static final Logger LOG = Logger.getInstance(JUnitDevKitPatcher.class);
static final String SYSTEM_CL_PROPERTY = "java.system.class.loader";
private static final Key<Boolean> LOADER_VALID = Key.create("LOADER_VALID_9");
@Override
public void patchJavaParameters(@NotNull Project project, @Nullable Module module, JavaParameters javaParameters) {
Sdk jdk = javaParameters.getJdk();
if (jdk == null) {
return;
}
var jdk = javaParameters.getJdk();
if (jdk == null) return;
ParametersList vm = javaParameters.getVMParametersList();
var vm = javaParameters.getVMParametersList();
if (IntelliJProjectUtil.isIntelliJPlatformProject(project)) {
BuiltInServerConnectionData.passDataAboutBuiltInServer(javaParameters, project);
@@ -71,14 +71,15 @@ public final class JUnitDevKitPatcher extends JUnitPatcher {
if (!vm.hasProperty(SYSTEM_CL_PROPERTY) && !vm.getList().contains("--add-modules")) {
// check that UrlClassLoader is available in the test module classpath
// if module-path is used, skip custom loader
String qualifiedName = "com.intellij.util.lang.UrlClassLoader";
var qualifiedName = "com.intellij.util.lang.UrlClassLoader";
if (loaderValid(project, module, qualifiedName)) {
vm.addProperty(SYSTEM_CL_PROPERTY, qualifiedName);
vm.addProperty(UrlClassLoader.CLASSPATH_INDEX_PROPERTY_NAME, "true");
}
}
String basePath = project.getBasePath();
if (module != null && DevKitApplicationPatcherKt.hasIjentDefaultFsProviderInClassPath(module)) {
var basePath = project.getBasePath();
if (module != null && hasIjentDefaultFsProviderInClassPath(module)) {
DevKitApplicationPatcherKt.enableIjentDefaultFsProvider(project, project.getBasePath(), vm);
}
if (!vm.hasProperty(PathManager.PROPERTY_SYSTEM_PATH)) {
@@ -98,23 +99,21 @@ public final class JUnitDevKitPatcher extends JUnitPatcher {
}
jdk = IdeaJdk.findIdeaJdk(jdk);
if (jdk == null) {
return;
}
if (jdk == null) return;
if (!vm.hasProperty("idea.load.plugins.id") && module != null && PluginModuleType.isOfType(module)) {
//non-optional dependencies of 'idea.load.plugin.id' are automatically enabled (see com.intellij.ide.plugins.PluginManagerCore.detectReasonToNotLoad)
//we need to explicitly add optional dependencies to properly test them
List<String> ids = DescriptorUtil.getPluginAndOptionalDependenciesIds(module);
var ids = DescriptorUtil.getPluginAndOptionalDependenciesIds(module);
if (!ids.isEmpty()) {
vm.defineProperty("idea.load.plugins.id", String.join(",", ids));
}
}
Path sandboxHome = getSandboxPath(jdk);
var sandboxHome = getSandboxPath(jdk);
if (sandboxHome != null) {
if (!vm.hasProperty(PathManager.PROPERTY_HOME_PATH)) {
Path homeDir = sandboxHome.resolve("test");
var homeDir = sandboxHome.resolve("test");
try {
Files.createDirectories(homeDir);
}
@@ -122,7 +121,7 @@ public final class JUnitDevKitPatcher extends JUnitPatcher {
LOG.error(e);
}
String buildNumber = IdeaJdk.getBuildNumber(jdk.getHomePath());
var buildNumber = IdeaJdk.getBuildNumber(jdk.getHomePath());
if (buildNumber != null) {
try {
Files.writeString(homeDir.resolve("build.txt"), buildNumber);
@@ -141,7 +140,8 @@ public final class JUnitDevKitPatcher extends JUnitPatcher {
}
}
var libPath = jdk.getHomePath() + File.separator + "lib" + File.separator;
@SuppressWarnings({"UnnecessaryFullyQualifiedName", "IO_FILE_USAGE"})
var libPath = jdk.getHomePath() + java.io.File.separator + "lib" + java.io.File.separator;
javaParameters.getClassPath().addFirst(libPath + "idea.jar");
javaParameters.getClassPath().addFirst(libPath + "resources.jar");
}
@@ -158,10 +158,10 @@ public final class JUnitDevKitPatcher extends JUnitPatcher {
}
else if (!files.isEmpty()) {
var file = files.iterator().next();
String projectFilePath =
var projectFilePath =
Objects.requireNonNull(project.getProjectFilePath(), "Run configurations should not be invoked on the default project");
EelApi eelApi = EelProviderUtil.toEelApiBlocking(EelProviderUtil.getEelDescriptor(Path.of(projectFilePath)));
OS targetOs = EelProviderUtil.systemOs(eelApi);
var eelApi = EelProviderUtil.toEelApiBlocking(EelProviderUtil.getEelDescriptor(Path.of(projectFilePath)));
var targetOs = EelProviderUtil.systemOs(eelApi);
try (var stream = file.getInputStream()) {
JavaModuleOptions.readOptions(stream, targetOs).forEach(vm::add);
}
@@ -175,32 +175,42 @@ public final class JUnitDevKitPatcher extends JUnitPatcher {
}
}
static boolean loaderValid(Project project, Module module, String qualifiedName) {
static boolean loaderValid(@NotNull Project project, @Nullable Module module, @NotNull String qualifiedName) {
UserDataHolder holder = module == null ? project : module;
Key<Boolean> cacheKey = LOADER_VALID;
Boolean result = holder.getUserData(cacheKey);
var result = holder.getUserData(LOADER_VALID);
if (result == null) {
result = ReadAction.compute(() -> {
//noinspection RedundantCast
return DumbService.getInstance(project).computeWithAlternativeResolveEnabled((ThrowableComputable<Boolean, RuntimeException>)() -> {
GlobalSearchScope scope = module != null ? GlobalSearchScope.moduleRuntimeScope(module, true)
: GlobalSearchScope.allScope(project);
return JavaPsiFacade.getInstance(project).findClass(qualifiedName, scope) != null;
});
});
holder.putUserData(cacheKey, result);
result = ReadAction.compute(() -> DumbService.getInstance(project).computeWithAlternativeResolveEnabled(() -> {
var scope = module != null ? GlobalSearchScope.moduleRuntimeScope(module, true) : GlobalSearchScope.allScope(project);
return JavaPsiFacade.getInstance(project).findClass(qualifiedName, scope) != null;
}));
holder.putUserData(LOADER_VALID, result);
}
return result;
}
private static @Nullable Path getSandboxPath(Sdk jdk) {
SdkAdditionalData additionalData = jdk.getSdkAdditionalData();
if (additionalData instanceof Sandbox) {
String sandboxHome = ((Sandbox)additionalData).getSandboxHome();
if (jdk.getSdkAdditionalData() instanceof Sandbox sandbox) {
var sandboxHome = sandbox.getSandboxHome();
if (sandboxHome != null) {
return Path.of(sandboxHome).normalize().toAbsolutePath();
}
}
return null;
}
private static boolean hasIjentDefaultFsProviderInClassPath(Module startModule) {
var queue = new ArrayDeque<>(List.of(ModuleRootManager.getInstance(startModule).getModuleDependencies()));
var seen = new HashSet<Module>();
seen.add(startModule);
while (!queue.isEmpty()) {
var module = queue.removeFirst();
if (IJENT_BOOT_CLASSPATH_MODULE.equals(module.getName())) {
return true;
}
if (seen.add(module)) {
queue.addAll(List.of(ModuleRootManager.getInstance(module).getModuleDependencies()));
}
}
return false;
}
}