1. Do not call toCommandLine twice to avoid 'java.lang.IllegalStateEx…

…ception: environment was provided twice' 2. Fix running inside IDEA terminal Close #3
turbanoff · May 22, 2021 · 98200d7 · 98200d7
1 parent 13a5fe1
commit 98200d7
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 20 deletions.
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>org.turbanov.execution.cmd</id>
     <name>RunInCmd</name>
-    <version>1.7</version>
+    <version>1.8</version>
     <vendor email="[email protected]" url="https://github.com/turbanoff/RunInCmdPlugin">Turbanov Andrey</vendor>
 
     <description><![CDATA[
@@ -12,6 +12,11 @@
     <!--Add change notes here.<br>-->
     <!--<em>most HTML tags may be used</em>-->
     <change-notes><![CDATA[
+        <h3>1.8</h3>
+        <ul>
+            <li>Fix IllegalStateException in IntelliJ IDEA 2020.1</li>
+            <li>Fix run inside IDEA terminal</li>
+        </ul>
         <h3>1.7</h3>
         <ul>
             <li>Update to support IntelliJ IDEA 2019.x</li>
@@ -70,14 +75,6 @@
         <projectService serviceImplementation="org.turbanov.execution.cmd.OptionsPatchConfiguration"/>
     </extensions>
 
-    <application-components>
-        <!-- Add your application components here -->
-    </application-components>
-
-    <project-components>
-        <!-- Add your project components here -->
-    </project-components>
-
     <actions>
         <!-- Add your actions here -->
     </actions>

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # RunInCmdPlugin
-Plugin for IntelliJ IDEA. It allows to run your RunConfiguration inside cmd.exe instead of internal IDEA console
-Also it provides ability to modify program and VM options on-the-fly before run
+Plugin for IntelliJ IDEA. It allows to run your RunConfiguration inside cmd.exe instead of internal IDEA console.
+Also it provides ability to modify a program and VM options on-the-fly before run.
 
 # Repository link
 https://plugins.jetbrains.com/plugin/7976-runincmd

diff --git a/META-INF/terminal.plugin.support.xml → ...rces/META-INF/terminal.plugin.support.xml b/META-INF/terminal.plugin.support.xml → ...rces/META-INF/terminal.plugin.support.xml
diff --git a/src/org/turbanov/execution/cmd/InCmdRunner.java b/src/org/turbanov/execution/cmd/InCmdRunner.java
@@ -75,8 +75,10 @@ protected RunContentDescriptor doExecute(@NotNull RunProfileState runProfileStat
         JavaCommandLineState state = (JavaCommandLineState) runProfileState;
         JavaParameters javaParameters = state.getJavaParameters();
         javaParameters.setUseDynamicClasspath(false);
-        GeneralCommandLine oldCommandLine = javaParameters.toCommandLine();
-        LOG.info("Old command line: " + oldCommandLine);
+        LOG.info("Old command line. JDK path: " + javaParameters.getJdkPath() +
+                " VM options: " + javaParameters.getVMParametersList() +
+                " Parameters: " + javaParameters.getProgramParametersList()
+        );
 
         OptionsPatchConfiguration options = ServiceManager.getService(environment.getProject(), OptionsPatchConfiguration.class);
         patchParameterList(javaParameters.getVMParametersList(), options.toAddVmOptions, options.toRemoveVmOptions, options.startPort);

diff --git a/src/org/turbanov/execution/cmd/TerminalRunner.java b/src/org/turbanov/execution/cmd/TerminalRunner.java
@@ -3,8 +3,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.terminal.LocalTerminalDirectRunner;
+import org.jetbrains.plugins.terminal.TerminalProcessOptions;
 import org.jetbrains.plugins.terminal.TerminalView;
 import com.intellij.openapi.project.Project;
+import com.intellij.terminal.JBTerminalWidget;
 import com.pty4j.PtyProcess;
 
 import java.io.IOException;
@@ -21,15 +23,25 @@ public static void runInIdeaTerminal(@NotNull Project project, @NotNull String[]
         LocalTerminalDirectRunner runner = new LocalTerminalDirectRunner(project) {
             @Override
             protected PtyProcess createProcess(@Nullable String directory, @Nullable String commandHistoryFilePath) throws ExecutionException {
-                Map<String, String> envs = new HashMap<>(System.getenv());
-                envs.put("CLASSPATH", classPath);
-                try {
-                    return PtyProcess.exec(command, envs, workingDirectory);
-                } catch (IOException e) {
-                    throw new ExecutionException(e);
-                }
+                return createProcessImpl(classPath, command, workingDirectory);
+            }
+
+
+            @Override
+            public @NotNull PtyProcess createProcess(@NotNull TerminalProcessOptions options, @Nullable JBTerminalWidget widget) throws ExecutionException {
+                return createProcessImpl(classPath, command, workingDirectory);
             }
         };
         terminalView.createNewSession(runner);
     }
+
+    private static PtyProcess createProcessImpl(@NotNull String classPath, @NotNull String[] command, @NotNull String workingDirectory) throws ExecutionException {
+        Map<String, String> envs = new HashMap<>(System.getenv());
+        envs.put("CLASSPATH", classPath);
+        try {
+            return PtyProcess.exec(command, envs, workingDirectory);
+        } catch (IOException e) {
+            throw new ExecutionException(e);
+        }
+    }
 }