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

RUBY-19381 Re-opening Ruby mine do not save project list and preferences

Browse Source
This commit is contained in:
Vladimir Krivosheev
2017-03-29 12:38:59 +02:00
parent 6b65aa2410
commit 04eb11100e
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java
+9 -16
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,17 +26,14 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.ModuleListener;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashSet;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
@@ -44,9 +41,6 @@ import java.util.Set;
public final class ModuleRunConfigurationManager implements PersistentStateComponent<Element> {
private static final Logger LOG = Logger.getInstance(ModuleRunConfigurationManager.class);
@NotNull
private final Condition<RunnerAndConfigurationSettings> myModuleConfigCondition =
settings -> settings != null && usesMyModule(settings.getConfiguration());
@NotNull
private final Module myModule;
@NotNull
private final RunManagerImpl myManager;
@@ -62,8 +56,10 @@ public final class ModuleRunConfigurationManager implements PersistentStateCompo
public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) {
if (myModule.equals(module)) {
LOG.debug("time to remove something from project (" + project + ")");
for (final RunnerAndConfigurationSettings settings : getModuleRunConfigurationSettings()) {
myManager.removeConfiguration(settings);
for (RunnerAndConfigurationSettings settings : new ArrayList<>(myManager.getConfigurationSettings())) {
if (usesMyModule(settings.getConfiguration())) {
myManager.removeConfiguration(settings);
}
}
}
}
@@ -94,11 +90,6 @@ public final class ModuleRunConfigurationManager implements PersistentStateCompo
}
}
@NotNull
private Collection<? extends RunnerAndConfigurationSettings> getModuleRunConfigurationSettings() {
return ContainerUtil.filter(myManager.getConfigurationSettings(), myModuleConfigCondition);
}
private boolean usesMyModule(RunConfiguration config) {
return config instanceof ModuleBasedConfiguration
&& myModule.equals(((ModuleBasedConfiguration)config).getConfigurationModule().getModule());
@@ -106,8 +97,10 @@ public final class ModuleRunConfigurationManager implements PersistentStateCompo
public void writeExternal(@NotNull final Element element) throws WriteExternalException {
LOG.debug("writeExternal(" + myModule + ")");
for (final RunnerAndConfigurationSettings settings : getModuleRunConfigurationSettings()) {
myManager.addConfigurationElement(element, settings);
for (RunnerAndConfigurationSettings settings : new ArrayList<>(myManager.getConfigurationSettings())) {
if (usesMyModule(settings.getConfiguration())) {
myManager.addConfigurationElement(element, settings);
}
}
if (myUnloadedElements != null) {
for (final Element unloadedElement : myUnloadedElements) {