From 0a7eee1a2c1fd2188f7f872614e3e22be6b807c2 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 2 May 2025 06:42:26 +0300 Subject: [PATCH 1/2] Reformatting GenericDebuggerRunner. --- .../debugger/impl/GenericDebuggerRunner.java | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java index c7e386ed32..56fdae5a15 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java @@ -61,10 +61,12 @@ protected RunContentDescriptor doExecute(@Nonnull RunProfileState state, @Nonnul } @Nullable - protected RunContentDescriptor createContentDescriptor(@Nonnull RunProfileState state, - @Nonnull ExecutionEnvironment environment) throws ExecutionException { + protected RunContentDescriptor createContentDescriptor( + @Nonnull RunProfileState state, + @Nonnull ExecutionEnvironment environment + ) throws ExecutionException { if (state instanceof JavaCommandLine) { - final OwnJavaParameters parameters = ((JavaCommandLine) state).getJavaParameters(); + final OwnJavaParameters parameters = ((JavaCommandLine)state).getJavaParameters(); runCustomPatchers(parameters, environment.getExecutor(), environment.getRunProfile()); RemoteConnection connection = DebuggerManagerImpl.createDebugParameters(parameters, true, DebuggerSettings.getInstance().DEBUGGER_TRANSPORT, "", false); @@ -75,7 +77,7 @@ protected RunContentDescriptor createContentDescriptor(@Nonnull RunProfileState return attachVirtualMachine(state, environment, connection, true); } if (state instanceof RemoteState) { - final RemoteConnection connection = createRemoteDebugConnection((RemoteState) state, environment.getRunnerSettings()); + final RemoteConnection connection = createRemoteDebugConnection((RemoteState)state, environment.getRunnerSettings()); return attachVirtualMachine(state, environment, connection, false); } @@ -83,10 +85,12 @@ protected RunContentDescriptor createContentDescriptor(@Nonnull RunProfileState } @Nullable - protected RunContentDescriptor attachVirtualMachine(RunProfileState state, - @Nonnull ExecutionEnvironment env, - RemoteConnection connection, - boolean pollConnection) throws ExecutionException { + protected RunContentDescriptor attachVirtualMachine( + RunProfileState state, + @Nonnull ExecutionEnvironment env, + RemoteConnection connection, + boolean pollConnection + ) throws ExecutionException { DebugEnvironment environment = new DefaultDebugEnvironment(env, state, connection, pollConnection); final DebuggerSession debuggerSession = DebuggerManagerEx.getInstanceEx(env.getProject()).attachVirtualMachine(environment); if (debuggerSession == null) { @@ -108,7 +112,7 @@ protected RunContentDescriptor attachVirtualMachine(RunProfileState state, ExecutionResult executionResult = debugProcess.getExecutionResult(); session.addExtraActions(executionResult.getActions()); if (executionResult instanceof DefaultExecutionResult) { - session.addRestartActions(((DefaultExecutionResult) executionResult).getRestartActions()); + session.addRestartActions(((DefaultExecutionResult)executionResult).getRestartActions()); } return JavaDebugProcess.create(session, debuggerSession); }).getRunContentDescriptor(); @@ -117,7 +121,7 @@ protected RunContentDescriptor attachVirtualMachine(RunProfileState state, private static RemoteConnection createRemoteDebugConnection(RemoteState connection, final RunnerSettings settings) { final RemoteConnection remoteConnection = connection.getRemoteConnection(); - GenericDebuggerRunnerSettings debuggerRunnerSettings = (GenericDebuggerRunnerSettings) settings; + GenericDebuggerRunnerSettings debuggerRunnerSettings = (GenericDebuggerRunnerSettings)settings; if (debuggerRunnerSettings != null) { remoteConnection.setUseSockets(debuggerRunnerSettings.getTransport() == DebuggerSettings.SOCKET_TRANSPORT); @@ -133,16 +137,21 @@ public GenericDebuggerRunnerSettings createConfigurationData(ConfigurationInfoPr } @Override - public void patch(OwnJavaParameters javaParameters, - RunnerSettings settings, - RunProfile runProfile, - final boolean beforeExecution) throws ExecutionException { + public void patch( + OwnJavaParameters javaParameters, + RunnerSettings settings, + RunProfile runProfile, + final boolean beforeExecution + ) throws ExecutionException { doPatch(javaParameters, settings); runCustomPatchers(javaParameters, Executor.EP_NAME.findExtension(DefaultDebugExecutor.class), runProfile); } - private static RemoteConnection doPatch(final OwnJavaParameters javaParameters, final RunnerSettings settings) throws ExecutionException { - final GenericDebuggerRunnerSettings debuggerSettings = ((GenericDebuggerRunnerSettings) settings); + private static RemoteConnection doPatch( + final OwnJavaParameters javaParameters, + final RunnerSettings settings + ) throws ExecutionException { + final GenericDebuggerRunnerSettings debuggerSettings = ((GenericDebuggerRunnerSettings)settings); if (StringUtil.isEmpty(debuggerSettings.getDebugPort())) { debuggerSettings.setDebugPort(DebuggerUtils.getInstance().findAvailableDebugAddress(debuggerSettings.getTransport()).address()); } @@ -152,7 +161,7 @@ private static RemoteConnection doPatch(final OwnJavaParameters javaParameters, @Override public SettingsEditor getSettingsEditor(final Executor executor, RunConfiguration configuration) { if (configuration instanceof RunConfigurationWithRunnerSettings) { - if (((RunConfigurationWithRunnerSettings) configuration).isSettingsNeeded()) { + if (((RunConfigurationWithRunnerSettings)configuration).isSettingsNeeded()) { return new GenericDebuggerParametersRunnerConfigurable(configuration.getProject()); } } From 651324d660b36985df585cc7ec4f7642f038d141 Mon Sep 17 00:00:00 2001 From: UNV Date: Fri, 2 May 2025 06:45:17 +0300 Subject: [PATCH 2/2] =?UTF-8?q?Fixing=20EP=5FNAME=20=E2=86=92=20ExtensionP?= =?UTF-8?q?oint.=20Some=20refactoring.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debugger/impl/GenericDebuggerRunner.java | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java index 56fdae5a15..1ea48c2a45 100644 --- a/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java +++ b/java-debugger-impl/src/main/java/com/intellij/java/debugger/impl/GenericDebuggerRunner.java @@ -24,6 +24,7 @@ import com.intellij.java.execution.configurations.*; import com.intellij.java.execution.runners.JavaPatchableProgramRunner; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; import consulo.document.FileDocumentManager; import consulo.execution.DefaultExecutionResult; import consulo.execution.ExecutionResult; @@ -44,7 +45,7 @@ @ExtensionImpl(id = "defaultJavaDebugRunner") public class GenericDebuggerRunner extends JavaPatchableProgramRunner { @Override - public boolean canRun(@Nonnull final String executorId, @Nonnull final RunProfile profile) { + public boolean canRun(@Nonnull String executorId, @Nonnull RunProfile profile) { return executorId.equals(DefaultDebugExecutor.EXECUTOR_ID) && profile instanceof GenericDebugRunnerConfiguration; } @@ -65,19 +66,24 @@ protected RunContentDescriptor createContentDescriptor( @Nonnull RunProfileState state, @Nonnull ExecutionEnvironment environment ) throws ExecutionException { - if (state instanceof JavaCommandLine) { - final OwnJavaParameters parameters = ((JavaCommandLine)state).getJavaParameters(); + if (state instanceof JavaCommandLine commandLine) { + OwnJavaParameters parameters = commandLine.getJavaParameters(); runCustomPatchers(parameters, environment.getExecutor(), environment.getRunProfile()); - RemoteConnection connection = - DebuggerManagerImpl.createDebugParameters(parameters, true, DebuggerSettings.getInstance().DEBUGGER_TRANSPORT, "", false); + RemoteConnection connection = DebuggerManagerImpl.createDebugParameters( + parameters, + true, + DebuggerSettings.getInstance().DEBUGGER_TRANSPORT, + "", + false + ); return attachVirtualMachine(state, environment, connection, true); } if (state instanceof PatchedRunnableState) { - final RemoteConnection connection = doPatch(new OwnJavaParameters(), environment.getRunnerSettings()); + RemoteConnection connection = doPatch(new OwnJavaParameters(), environment.getRunnerSettings()); return attachVirtualMachine(state, environment, connection, true); } - if (state instanceof RemoteState) { - final RemoteConnection connection = createRemoteDebugConnection((RemoteState)state, environment.getRunnerSettings()); + if (state instanceof RemoteState remoteState) { + RemoteConnection connection = createRemoteDebugConnection(remoteState, environment.getRunnerSettings()); return attachVirtualMachine(state, environment, connection, false); } @@ -92,12 +98,12 @@ protected RunContentDescriptor attachVirtualMachine( boolean pollConnection ) throws ExecutionException { DebugEnvironment environment = new DefaultDebugEnvironment(env, state, connection, pollConnection); - final DebuggerSession debuggerSession = DebuggerManagerEx.getInstanceEx(env.getProject()).attachVirtualMachine(environment); + DebuggerSession debuggerSession = DebuggerManagerEx.getInstanceEx(env.getProject()).attachVirtualMachine(environment); if (debuggerSession == null) { return null; } - final DebugProcessImpl debugProcess = debuggerSession.getProcess(); + DebugProcessImpl debugProcess = debuggerSession.getProcess(); if (debugProcess.isDetached() || debugProcess.isDetaching()) { debuggerSession.dispose(); return null; @@ -118,8 +124,8 @@ protected RunContentDescriptor attachVirtualMachine( }).getRunContentDescriptor(); } - private static RemoteConnection createRemoteDebugConnection(RemoteState connection, final RunnerSettings settings) { - final RemoteConnection remoteConnection = connection.getRemoteConnection(); + private static RemoteConnection createRemoteDebugConnection(RemoteState connection, RunnerSettings settings) { + RemoteConnection remoteConnection = connection.getRemoteConnection(); GenericDebuggerRunnerSettings debuggerRunnerSettings = (GenericDebuggerRunnerSettings)settings; @@ -141,17 +147,18 @@ public void patch( OwnJavaParameters javaParameters, RunnerSettings settings, RunProfile runProfile, - final boolean beforeExecution + boolean beforeExecution ) throws ExecutionException { doPatch(javaParameters, settings); - runCustomPatchers(javaParameters, Executor.EP_NAME.findExtension(DefaultDebugExecutor.class), runProfile); + runCustomPatchers( + javaParameters, + Application.get().getExtensionPoint(Executor.class).findExtension(DefaultDebugExecutor.class), + runProfile + ); } - private static RemoteConnection doPatch( - final OwnJavaParameters javaParameters, - final RunnerSettings settings - ) throws ExecutionException { - final GenericDebuggerRunnerSettings debuggerSettings = ((GenericDebuggerRunnerSettings)settings); + private static RemoteConnection doPatch(OwnJavaParameters javaParameters, RunnerSettings settings) throws ExecutionException { + GenericDebuggerRunnerSettings debuggerSettings = ((GenericDebuggerRunnerSettings)settings); if (StringUtil.isEmpty(debuggerSettings.getDebugPort())) { debuggerSettings.setDebugPort(DebuggerUtils.getInstance().findAvailableDebugAddress(debuggerSettings.getTransport()).address()); } @@ -159,11 +166,10 @@ private static RemoteConnection doPatch( } @Override - public SettingsEditor getSettingsEditor(final Executor executor, RunConfiguration configuration) { - if (configuration instanceof RunConfigurationWithRunnerSettings) { - if (((RunConfigurationWithRunnerSettings)configuration).isSettingsNeeded()) { - return new GenericDebuggerParametersRunnerConfigurable(configuration.getProject()); - } + public SettingsEditor getSettingsEditor(Executor executor, RunConfiguration configuration) { + if (configuration instanceof RunConfigurationWithRunnerSettings runConfigurationWithRunnerSettings + && runConfigurationWithRunnerSettings.isSettingsNeeded()) { + return new GenericDebuggerParametersRunnerConfigurable(configuration.getProject()); } return null; }