From d7b8bdd0dd49aa6bac0cbcf6c4dd8f722ec625a5 Mon Sep 17 00:00:00 2001 From: Elena Shaverdova Date: Wed, 17 Jun 2020 16:40:30 +0200 Subject: [PATCH] WI-53523 XDebug - Works one time only, unless remote listener is enabled GitOrigin-RevId: d970821f5669ca609ffc553bce93481d02f3cf6c --- .../xdebugger/settings/XDebuggerSettingsManager.java | 3 ++- .../impl/settings/XDebuggerSettingManagerImpl.java | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettingsManager.java b/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettingsManager.java index 76ef27d310b3..2b6e85bd0a67 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettingsManager.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettingsManager.java @@ -15,10 +15,11 @@ */ package com.intellij.xdebugger.settings; +import com.intellij.openapi.Disposable; import com.intellij.openapi.components.ServiceManager; import org.jetbrains.annotations.NotNull; -public abstract class XDebuggerSettingsManager { +public abstract class XDebuggerSettingsManager implements Disposable { public static XDebuggerSettingsManager getInstance() { return ServiceManager.getService(XDebuggerSettingsManager.class); } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java index a3cacbabb165..771d385c86a2 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerSettingManagerImpl.java @@ -3,6 +3,7 @@ package com.intellij.xdebugger.impl.settings; import com.intellij.configurationStore.ComponentSerializationUtil; import com.intellij.configurationStore.XmlSerializer; +import com.intellij.openapi.Disposable; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; @@ -20,7 +21,8 @@ import java.util.Collection; import java.util.List; @State(name = "XDebuggerSettings", storages = @Storage("debugger.xml")) -public class XDebuggerSettingManagerImpl extends XDebuggerSettingsManager implements PersistentStateComponent { +public class XDebuggerSettingManagerImpl extends XDebuggerSettingsManager + implements PersistentStateComponent, Disposable { private XDebuggerDataViewSettings myDataViewSettings = new XDebuggerDataViewSettings(); private XDebuggerGeneralSettings myGeneralSettings = new XDebuggerGeneralSettings(); @@ -75,6 +77,10 @@ public class XDebuggerSettingManagerImpl extends XDebuggerSettingsManager implem } } + @Override + public void dispose() { + } + private static XDebuggerSettings findSettings(String id) { return XDebuggerSettings.EXTENSION_POINT.extensions().filter(e -> id.equals(e.getId())).findFirst().orElse(null); }