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

[devkit] IDEA-341419 IDEA 233 freezes with 2 gray frames right at start

Browse Source 
GitOrigin-RevId: 6ebd9b0bde72751efb0f5b572eb031d8396a2d2f
This commit is contained in:
Yann Cébron
2024-01-11 18:48:22 +00:00
committed by intellij-monorepo-bot
parent ef67215e48
commit 677cecc367
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/devkit-core/src/run/PluginRunConfiguration.java
+13 -20
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.idea.devkit.run;
import com.intellij.diagnostic.logging.LogConfigurationPanel;
@@ -8,13 +8,14 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.Executor;
import com.intellij.execution.configurations.*;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.JetBrainsProtocolHandler;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModulePointer;
import com.intellij.openapi.module.ModulePointerManager;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.options.SettingsEditorGroup;
import com.intellij.openapi.project.Project;
@@ -60,8 +61,7 @@ public class PluginRunConfiguration extends RunConfigurationBase<Element> implem
private static final String PATH = "path";
private static final String ALTERNATIVE_PATH_ENABLED_ATTR = "alternative-path-enabled";
private Module myModule;
private String myModuleName;
private @Nullable ModulePointer myModulePointer;
public String VM_PARAMETERS;
public String PROGRAM_PARAMETERS;
@@ -328,7 +328,8 @@ public class PluginRunConfiguration extends RunConfigurationBase<Element> implem
public void readExternal(@NotNull Element element) throws InvalidDataException {
Element module = element.getChild(MODULE);
if (module != null) {
myModuleName = module.getAttributeValue(NAME);
String moduleName = module.getAttributeValue(NAME);
myModulePointer = ModulePointerManager.getInstance(getProject()).create(moduleName);
}
DefaultJDOMExternalizer.readExternal(this, element);
final Element altElement = element.getChild(ALTERNATIVE_PATH_ELEMENT);
@@ -346,14 +347,8 @@ public class PluginRunConfiguration extends RunConfigurationBase<Element> implem
@Override
public void writeExternal(@NotNull Element element) throws WriteExternalException {
Element moduleElement = new Element(MODULE);
moduleElement.setAttribute(NAME, ApplicationManager.getApplication().runReadAction(new Computable<>() {
@Override
public String compute() {
final Module module = getModule();
return module != null ? module.getName()
: myModuleName != null ? myModuleName : "";
}
}));
String moduleName = myModulePointer != null ? myModulePointer.getModuleName() : "";
moduleElement.setAttribute(NAME, moduleName);
element.addContent(moduleElement);
DefaultJDOMExternalizer.writeExternal(this, element);
if (!StringUtil.isEmptyOrSpaces(ALTERNATIVE_JRE_PATH)) {
@@ -366,17 +361,15 @@ public class PluginRunConfiguration extends RunConfigurationBase<Element> implem
}
public @Nullable Module getModule() {
if (myModule == null && myModuleName != null && !getProject().isDisposed()) {
myModule = ModuleManager.getInstance(getProject()).findModuleByName(myModuleName);
if (myModulePointer != null) {
return myModulePointer.getModule();
}
if (myModule != null && myModule.isDisposed()) {
myModule = null;
}
return myModule;
return null;
}
public void setModule(Module module) {
myModule = module;
myModulePointer = ModulePointerManager.getInstance(getProject()).create(module);
}
private static @Nullable String getPluginId(Module plugin) {