From 55657036a109e8046233c1a5849497b898e8d30e Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Mon, 10 Jun 2024 19:41:34 +0200 Subject: [PATCH] idea: fix support for 2024.1+ --- .../org/teavm/idea/debug/TeaVMDebugProcess.java | 13 ++++++------- tools/idea/src/main/resources/META-INF/plugin.xml | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java index 9cdaa7f81..21b21e5c7 100644 --- a/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java @@ -20,6 +20,7 @@ import com.intellij.execution.ui.ExecutionConsole; import com.intellij.icons.AllIcons; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.util.Key; import com.intellij.xdebugger.XDebugProcess; import com.intellij.xdebugger.XDebugSession; @@ -44,6 +45,8 @@ import org.teavm.debugging.information.URLDebugInformationProvider; public class TeaVMDebugProcess extends XDebugProcess { public static final Key INNER_BREAKPOINT_KEY = new Key<>("TeaVM breakpoint"); + private static final ExtensionPointName> BREAKPOINT_EXT_NAME = + new ExtensionPointName<>("org.teavm.extensions.breakpointProvider"); private TeaVMDebuggerEditorsProvider editorsProvider; private final Debugger innerDebugger; private final List> breakpointHandlers = new ArrayList<>(); @@ -91,13 +94,9 @@ public class TeaVMDebugProcess extends XDebugProcess { breakpointHandlers.add(new TeaVMLineBreakpointHandler<>(JavaLineBreakpointType.class, session.getProject(), innerDebugger, this)); - var breakpointProvider = session.getProject().getExtensionArea() - .>getExtensionPoint("org.teavm.extensions.breakpointProvider"); - if (breakpointProvider != null) { - for (TeaVMBreakpointProvider provider : breakpointProvider.getExtensions()) { - breakpointHandlers.add(new TeaVMLineBreakpointHandler<>(provider.getBreakpointType(), - session.getProject(), innerDebugger, this)); - } + for (var provider : BREAKPOINT_EXT_NAME.getExtensionList()) { + breakpointHandlers.add(new TeaVMLineBreakpointHandler<>(provider.getBreakpointType(), + session.getProject(), innerDebugger, this)); } } diff --git a/tools/idea/src/main/resources/META-INF/plugin.xml b/tools/idea/src/main/resources/META-INF/plugin.xml index 4134e49e9..50e6d6bc6 100644 --- a/tools/idea/src/main/resources/META-INF/plugin.xml +++ b/tools/idea/src/main/resources/META-INF/plugin.xml @@ -28,7 +28,7 @@ - \ No newline at end of file