fix: don't use internal API

angelozerr · angelozerr · commit 17385320b19d · 2025-03-07T18:06:32.000+01:00
Signed-off-by: azerr &lt;azerr@redhat.com&gt;
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/dap/DAPDebugProcess.java b/src/main/java/com/redhat/devtools/lsp4ij/dap/DAPDebugProcess.java
@@ -99,9 +99,8 @@ public DAPDebugProcess(@NotNull DAPCommandLineState dapState,
             public void run(@NotNull ProgressIndicator indicator) {
 
                 DAPDebugProcess.this.status = Status.STARTING;
-                if (dapState.getDebugMode()== DebugMode.ATTACH) {
-                    print(taskTitle, ConsoleViewContentType.SYSTEM_OUTPUT);
-                }
+                print(taskTitle, ConsoleViewContentType.SYSTEM_OUTPUT);
+
                 // The Debug server is launched, create a DAP client and connect to the server when it is ready:
                 // - wait for socket port
                 // - or wait for some ms
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/dap/DAPDebugRunner.java b/src/main/java/com/redhat/devtools/lsp4ij/dap/DAPDebugRunner.java
@@ -11,12 +11,11 @@
 package com.redhat.devtools.lsp4ij.dap;
 
 import com.intellij.execution.ExecutionException;
-import com.intellij.execution.ExecutionManager;
 import com.intellij.execution.ExecutionResult;
 import com.intellij.execution.configurations.RunProfile;
 import com.intellij.execution.configurations.RunProfileState;
 import com.intellij.execution.runners.ExecutionEnvironment;
-import com.intellij.execution.runners.ProgramRunner;
+import com.intellij.execution.runners.GenericProgramRunner;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.xdebugger.XDebugProcess;
@@ -27,13 +26,12 @@
 import com.redhat.devtools.lsp4ij.dap.configurations.DAPRunConfiguration;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-
-import java.util.Objects;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Debug Adapter Protocol (DAP) program runner.
  */
-public class DAPDebugRunner implements ProgramRunner {
+public class DAPDebugRunner extends GenericProgramRunner {
 
     private static final @NotNull
     @NonNls String RUNNER_ID = "DAPDebugRunner";
@@ -51,12 +49,10 @@ public boolean canRun(@NotNull String executorId, @NotNull RunProfile profile) {
     }
 
     @Override
-    public void execute(@NotNull ExecutionEnvironment environment) throws ExecutionException {
-        ExecutionManager.getInstance(environment.getProject())
-                .startRunProfile(environment, Objects.requireNonNull(environment.getState()), state -> {
-                    FileDocumentManager.getInstance().saveAllDocuments();
-                    return createContentDescriptor(state, environment);
-                });
+    protected @Nullable RunContentDescriptor doExecute(@NotNull RunProfileState state,
+                                                       @NotNull ExecutionEnvironment environment) throws ExecutionException {
+        FileDocumentManager.getInstance().saveAllDocuments();
+        return createContentDescriptor(state, environment);
     }
 
     private RunContentDescriptor createContentDescriptor(@NotNull RunProfileState state,
diff --git a/src/main/java/com/redhat/devtools/lsp4ij/dap/client/variables/providers/DefaultVariableRangeRegistrar.java b/src/main/java/com/redhat/devtools/lsp4ij/dap/client/variables/providers/DefaultVariableRangeRegistrar.java
@@ -65,8 +65,8 @@ public boolean tryRegisterVariableRange(@NotNull IElementType tokenType,
                                             int end,
                                             @NotNull Document document,
                                             @NotNull DebugVariableContext context) {
-        if ("identifier".equalsIgnoreCase(tokenType.getDebugName())
-                || "character".equalsIgnoreCase(tokenType.getDebugName())) {
+        String tokenName = tokenType.toString();
+        if ("identifier".equalsIgnoreCase(tokenName) || "character".equalsIgnoreCase(tokenName)) {
             var textRange = new TextRange(start, end);
             String variableName = document.getText(textRange);
             context.addVariableRange(variableName, textRange);
diff --git a/src/main/resources/dap/templates/python-debugpy/template.json b/src/main/resources/dap/templates/python-debugpy/template.json
@@ -1,6 +1,6 @@
 {
   "id": "python-debugpy",
-  "name": "Python- Debugpy",
+  "name": "Python - Debugpy",
   "attach": {
     "address": "$connect.host",
     "port": "$connect.port"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "python-debugpy",`
`3`		`- "name": "Python- Debugpy",`
	`3`	`+ "name": "Python - Debugpy",`
`4`	`4`	`"attach": {`
`5`	`5`	`"address": "$connect.host",`
`6`	`6`	`"port": "$connect.port"`