Skip to content

Fixing compilation after platform update. Some refactoring #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
Oct 3, 2026
Merged

Fixing compilation after platform update. Some refactoring #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions ...-debugger-impl/src/main/java/com/intellij/java/debugger/impl/engine/DebugProcessImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import com.intellij.java.debugger.engine.jdi.ThreadReferenceProxy;
import com.intellij.java.debugger.impl.*;
import com.intellij.java.debugger.impl.actions.DebuggerAction;
import com.intellij.java.debugger.impl.actions.DebuggerActions;
import com.intellij.java.debugger.impl.engine.evaluation.EvaluationContextImpl;
import com.intellij.java.debugger.impl.engine.evaluation.EvaluationListener;
import com.intellij.java.debugger.impl.engine.events.DebuggerCommandImpl;
Expand Down Expand Up @@ -85,7 +84,7 @@
import consulo.process.event.ProcessEvent;
import consulo.process.event.ProcessListener;
import consulo.project.Project;
import consulo.project.ui.notification.NotificationType;
import consulo.project.ui.notification.NotificationService;
import consulo.project.ui.wm.ToolWindowId;
import consulo.proxy.EventDispatcher;
import consulo.ui.UIAccess;
Expand All @@ -99,8 +98,8 @@
import consulo.util.dataholder.UserDataHolderBase;
import consulo.util.lang.Pair;
import consulo.util.lang.StringUtil;
import org.jspecify.annotations.Nullable;
import org.intellij.lang.annotations.MagicConstant;
import org.jspecify.annotations.Nullable;

import java.io.IOException;
import java.net.UnknownHostException;
Expand Down Expand Up @@ -493,16 +492,16 @@ private VirtualMachine createVirtualMachineInt() throws ExecutionException {
(ListeningConnector)findConnector(myConnection.isUseSockets() ? SOCKET_LISTENING_CONNECTOR_NAME : SHMEM_LISTENING_CONNECTOR_NAME);
if (connector == null) {
throw new CantRunException(
JavaDebuggerLocalize.errorDebugConnectorNotFound(DebuggerUtils.getTransportName(myConnection)).get()
JavaDebuggerLocalize.errorDebugConnectorNotFound(DebuggerUtils.getTransportName(myConnection))
);
}
myArguments = connector.defaultArguments();
if (myArguments == null) {
throw new CantRunException(JavaDebuggerLocalize.errorNoDebugListenPort().get());
throw new CantRunException(JavaDebuggerLocalize.errorNoDebugListenPort());
}

if (address == null) {
throw new CantRunException(JavaDebuggerLocalize.errorNoDebugListenPort().get());
throw new CantRunException(JavaDebuggerLocalize.errorNoDebugListenPort());
}
// zero port number means the caller leaves to debugger to decide at which port to listen
//noinspection HardCodedStringLiteral
Expand Down Expand Up @@ -543,7 +542,7 @@ private VirtualMachine createVirtualMachineInt() throws ExecutionException {

if (connector == null) {
throw new CantRunException(
JavaDebuggerLocalize.errorDebugConnectorNotFound(DebuggerUtils.getTransportName(myConnection)).get()
JavaDebuggerLocalize.errorDebugConnectorNotFound(DebuggerUtils.getTransportName(myConnection))
);
}
myArguments = connector.defaultArguments();
Expand All @@ -554,7 +553,7 @@ private VirtualMachine createVirtualMachineInt() throws ExecutionException {
hostnameArg.setValue(myConnection.getHostName());
}
if (address == null) {
throw new CantRunException(JavaDebuggerLocalize.errorNoDebugAttachPort().get());
throw new CantRunException(JavaDebuggerLocalize.errorNoDebugAttachPort());
}
//noinspection HardCodedStringLiteral
Connector.Argument portArg = myArguments.get("port");
Expand All @@ -564,7 +563,7 @@ private VirtualMachine createVirtualMachineInt() throws ExecutionException {
}
else {
if (address == null) {
throw new CantRunException(JavaDebuggerLocalize.errorNoShmemAddress().get());
throw new CantRunException(JavaDebuggerLocalize.errorNoShmemAddress());
}
//noinspection HardCodedStringLiteral
Connector.Argument nameArg = myArguments.get("name");
Expand All @@ -583,7 +582,7 @@ private VirtualMachine createVirtualMachineInt() throws ExecutionException {
return connector.attach(myArguments);
}
catch (IllegalArgumentException e) {
throw new CantRunException(e.getLocalizedMessage());
throw new CantRunException(LocalizeValue.of(e.getLocalizedMessage()));
}
}
}
Expand Down Expand Up @@ -639,20 +638,20 @@ private void checkVirtualMachineVersion(VirtualMachine vm) {
}

if (getSession().getAlternativeJre() == null) {
Sdk runjre = getSession().getRunJre();
if ((runjre == null || runjre.getSdkType() instanceof JavaSdkType) && !versionMatch(runjre, version)) {
Sdk runJre = getSession().getRunJre();
if ((runJre == null || runJre.getSdkType() instanceof JavaSdkType) && !versionMatch(runJre, version)) {
JavaSdkTypeUtil.getAllJavaSdks().stream()
.filter(sdk -> versionMatch(sdk, version))
.findFirst()
.ifPresent(sdk -> {
XDebuggerUIConstants.NOTIFICATION_GROUP.createNotification(
JavaDebuggerLocalize.messageRemoteJreVersionMismatch(
NotificationService.getInstance()
.newInfo(XDebuggerUIConstants.NOTIFICATION_GROUP)
.content(JavaDebuggerLocalize.messageRemoteJreVersionMismatch(
version,
runjre != null ? runjre.getVersionString() : "unknown",
runJre != null ? runJre.getVersionString() : "unknown",
sdk.getName()
).get(),
NotificationType.INFORMATION
).notify(myProject);
))
.notify(myProject);
getSession().setAlternativeJre(sdk);
});
}
Expand Down Expand Up @@ -1744,7 +1743,7 @@ protected void applyThreadFilter(ThreadReferenceProxy thread) {
// there could be explicit resume as a result of call to voteSuspend()
// e.g. when breakpoint was considered invalid, in that case the filter will be applied _after_
// resuming and all breakpoints in other threads will be ignored.
// As resume() implicitly cleares the filter, the filter must be always applied _before_ any resume() action happens
// As resume() implicitly clears the filter, the filter must be always applied _before_ any resume() action happens
BreakpointManager breakpointManager = DebuggerManagerEx.getInstanceEx(getProject()).getBreakpointManager();
breakpointManager.applyThreadFilter(DebugProcessImpl.this, thread.getThreadReference());
}
Expand Down Expand Up @@ -2037,8 +2036,7 @@ protected void action() {
processHandler != null && (processHandler.isProcessTerminating() || processHandler.isProcessTerminated());

fail();
DebuggerInvocationUtil.swingInvokeLater(myProject, () ->
{
DebuggerInvocationUtil.swingInvokeLater(myProject, () -> {
// propagate exception only in case we succeeded to obtain execution result,
// otherwise if the error is induced by the fact that there is nothing to debug, and there is no need to show
// this problem to the user
Expand Down
Loading
Loading