MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Pass rcfile parameter as a environment variable in case of shell integration (IDEA-162329)

Browse Source
This commit is contained in:
Dmitry Trofimov
2016-10-10 20:25:31 +02:00
parent a9352e3895
commit 4f2c4bcabc
2 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/terminal/src/org/jetbrains/plugins/terminal/LocalTerminalDirectRunner.java
+19 -7
View File
@@ -102,7 +102,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
}
EncodingEnvironmentUtil.setLocaleEnvironmentIfMac(envs, myDefaultCharset);
String[] command = getCommand();
String[] command = getCommand(envs);
for (LocalTerminalCustomizer customizer : LocalTerminalCustomizer.EP_NAME.getExtensions()) {
try {
@@ -138,7 +138,7 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
@Override
protected ProcessHandler createProcessHandler(final PtyProcess process) {
return new PtyProcessHandler(process, getCommand()[0]);
return new PtyProcessHandler(process, getShellPath());
}
@Override
@@ -157,15 +157,19 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
}
public String[] getCommand() {
public String[] getCommand(Map<String, String> envs) {
String shellPath = TerminalOptionsProvider.getInstance().getShellPath();
String shellPath = getShellPath();
return getCommand(shellPath);
return getCommand(shellPath, envs, TerminalOptionsProvider.getInstance().shellIntegration());
}
private String getShellPath() {
return TerminalOptionsProvider.getInstance().getShellPath();
}
@NotNull
public static String[] getCommand(String shellPath) {
public static String[] getCommand(String shellPath, Map<String, String> envs, boolean shellIntegration) {
if (SystemInfo.isUnix) {
List<String> command = Lists.newArrayList(shellPath.split(" "));
@@ -182,10 +186,18 @@ public class LocalTerminalDirectRunner extends AbstractTerminalRunner<PtyProcess
if (rcFilePath != null &&
TerminalOptionsProvider.getInstance().shellIntegration() &&
shellIntegration &&
(shellName.equals("bash") || shellName.equals("sh"))) {
result.add("--rcfile");
result.add(rcFilePath);
int idx = command.indexOf("--rcfile");
if (idx >= 0) {
command.remove(idx);
if (idx < command.size()) {
envs.put("JEDITERM_SOURCE", command.get(idx));
command.remove(idx);
}
}
}
if (!loginOrInteractive(command)) {
plugins/terminal/tests/org/jetbrains/plugins/terminal/TerminalShellCommandTest.java
+17 -12
View File
@@ -15,51 +15,56 @@
*/
package org.jetbrains.plugins.terminal;
import com.google.common.collect.Maps;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.text.StringUtil;
import junit.framework.TestCase;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* @author traff
*/
public class TerminalShellCommandTest extends TestCase {
public void testDontAddAnything() {
doTest(new String[]{"myshell", "someargs", "-i"}, "myshell someargs -i");
doTest(new String[]{"myshell", "someargs", "--login"}, "myshell someargs --login");
doTest(new String[]{"myshell", "someargs", "-i"}, "myshell someargs -i", Maps.newHashMap());
doTest(new String[]{"myshell", "someargs", "--login"}, "myshell someargs --login", Maps.newHashMap());
}
public void testAddInteractiveOrLogin() {
if (SystemInfo.isLinux) {
contains("bash someargs", "-i", "someargs", "bash");
contains("bash someargs", Maps.newHashMap(), "-i", "someargs", "bash");
}
else if (SystemInfo.isMac) {
contains("bash someargs", "--login", "someargs", "bash");
contains("bash someargs", Maps.newHashMap(), "--login", "someargs", "bash");
}
}
public void testAddRcConfig() {
hasRcConfig("bash -i", "jediterm-sh.in");
hasRcConfig("sh --login", "jediterm-sh.in");
hasRcConfig("bash -i", "jediterm-sh.in", Maps.newHashMap());
hasRcConfig("sh --login", "jediterm-sh.in", Maps.newHashMap());
Map<String, String> envs = Maps.newHashMap();
hasRcConfig("sh --rcfile ~/.bashrc", "jediterm-sh.in", envs);
assertEquals("~/.bashrc", envs.get("JEDITERM_SOURCE"));
}
private static void hasRcConfig(String path, String configName) {
private static void hasRcConfig(String path, String configName, Map<String, String> envs) {
List<String> res = Arrays.asList(
LocalTerminalDirectRunner.getCommand(path));
LocalTerminalDirectRunner.getCommand(path, envs, true));
assertEquals("--rcfile", res.get(1));
assertTrue(res.get(2).contains(configName));
}
private static void doTest(String[] expected, String path) {
private static void doTest(String[] expected, String path, Map<String, String> envs) {
assertEquals(Arrays.asList(expected), Arrays.asList(
LocalTerminalDirectRunner.getCommand(path)));
LocalTerminalDirectRunner.getCommand(path, envs, true)));
}
private static void contains(String path, String... item) {
private static void contains(String path, Map<String, String> envs, String... item) {
List<String> result = Arrays.asList(
LocalTerminalDirectRunner.getCommand(path));
LocalTerminalDirectRunner.getCommand(path, envs, true));
for (String i : item) {
assertTrue(i + " isn't in " + StringUtil.join(result, " "), result.contains(i));